]> git.sesse.net Git - nageru/commitdiff
Remove a legacy FFmpeg test which is no longer needed (we have required 4.0 for a...
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Thu, 28 Mar 2019 18:10:24 +0000 (19:10 +0100)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Thu, 28 Mar 2019 18:22:47 +0000 (19:22 +0100)
shared/shared_defs.h

index fc3daa1a3b0785608ed2255ca537b40772dc3ef1..20c56bf4eb0ed02f0c39adfc3a2e6980ca11d082 100644 (file)
@@ -1,16 +1,9 @@
 #ifndef _SHARED_DEFS_H
 #define _SHARED_DEFS_H 1
 
-// This flag is only supported in FFmpeg 3.3 and up, and we only require 3.1.
-#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(57, 71, 100)
-#define MUX_SKIP_TRAILER "+skip_trailer"
-#else
-#define MUX_SKIP_TRAILER ""
-#endif
-
 #define MUX_OPTS { \
        /* Make seekable .mov files, and keep MP4 muxer from using unlimited amounts of memory. */ \
-       { "movflags", "empty_moov+frag_keyframe+default_base_moof" MUX_SKIP_TRAILER }, \
+       { "movflags", "empty_moov+frag_keyframe+default_base_moof+skip_trailer" }, \
        \
        /* Make for somewhat less bursty stream output when using .mov. */ \
        { "frag_duration", "125000" }, \