Commit 91360ce6 authored by Baptiste Coudurier's avatar Baptiste Coudurier

Unset variable fps for mov and mp4 muxer, they support it

but timestamps must start at 0 currently, and this causes sync
problem.

Originally committed as revision 25805 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 3b39e273
...@@ -2215,7 +2215,7 @@ AVOutputFormat mov_muxer = { ...@@ -2215,7 +2215,7 @@ AVOutputFormat mov_muxer = {
mov_write_header, mov_write_header,
ff_mov_write_packet, ff_mov_write_packet,
mov_write_trailer, mov_write_trailer,
.flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS, .flags = AVFMT_GLOBALHEADER,
.codec_tag = (const AVCodecTag* const []){codec_movvideo_tags, codec_movaudio_tags, 0}, .codec_tag = (const AVCodecTag* const []){codec_movvideo_tags, codec_movaudio_tags, 0},
}; };
#endif #endif
...@@ -2247,7 +2247,7 @@ AVOutputFormat mp4_muxer = { ...@@ -2247,7 +2247,7 @@ AVOutputFormat mp4_muxer = {
mov_write_header, mov_write_header,
ff_mov_write_packet, ff_mov_write_packet,
mov_write_trailer, mov_write_trailer,
.flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS, .flags = AVFMT_GLOBALHEADER,
.codec_tag = (const AVCodecTag* const []){ff_mp4_obj_type, 0}, .codec_tag = (const AVCodecTag* const []){ff_mp4_obj_type, 0},
}; };
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment