diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2010-11-23 00:41:28 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2010-11-23 00:41:28 +0000 |
| commit | 91360ce61d00bb20429fb41857abebf50a5c6b1d (patch) | |
| tree | 55f6af9a6ce16a23da3572a738cd16f28cae850b | |
| parent | 3b39e2739fd2c3fbb52f0824178973fdc1f41382 (diff) | |
| download | ffmpeg-91360ce61d00bb20429fb41857abebf50a5c6b1d.tar.gz | |
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
| -rw-r--r-- | libavformat/movenc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 77f122b6da..b1ad714267 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -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 |