]> git.sesse.net Git - ffmpeg/commitdiff
Unset variable fps for mov and mp4 muxer, they support it
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>
Tue, 23 Nov 2010 00:41:28 +0000 (00:41 +0000)
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>
Tue, 23 Nov 2010 00:41:28 +0000 (00:41 +0000)
but timestamps must start at 0 currently, and this causes sync
problem.

Originally committed as revision 25805 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavformat/movenc.c

index 77f122b6da22cd6d69e65ac5cd5fdfc7d03c6f70..b1ad7142671e9cb240d90009ecf635271adbba40 100644 (file)
@@ -2215,7 +2215,7 @@ AVOutputFormat mov_muxer = {
     mov_write_header,
     ff_mov_write_packet,
     mov_write_trailer,
-    .flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS,
+    .flags = AVFMT_GLOBALHEADER,
     .codec_tag = (const AVCodecTag* const []){codec_movvideo_tags, codec_movaudio_tags, 0},
 };
 #endif
@@ -2247,7 +2247,7 @@ AVOutputFormat mp4_muxer = {
     mov_write_header,
     ff_mov_write_packet,
     mov_write_trailer,
-    .flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS,
+    .flags = AVFMT_GLOBALHEADER,
     .codec_tag = (const AVCodecTag* const []){ff_mp4_obj_type, 0},
 };
 #endif