Merge branch 'development' into LTS_development

# Conflicts:
#	lib/dtsc.h
This commit is contained in:
Thulinma 2019-09-09 15:56:45 +02:00
commit 775d25947c
2 changed files with 7 additions and 7 deletions

View file

@ -99,7 +99,7 @@ static inline void show_stackframe(){}
#define SHM_DATASIZE 20
#endif
#define AUDIO_KEY_INTERVAL 5000 ///< This define controls the keyframe interval for non-video tracks, such as audio and metadata tracks.
#define AUDIO_KEY_INTERVAL 2000 ///< This define controls the keyframe interval for non-video tracks, such as audio and metadata tracks.
#ifndef STATS_DELAY
#define STATS_DELAY 15