diff options
| author | James Zern <jzern@google.com> | 2011-05-26 20:19:04 +0200 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2012-05-20 19:50:32 -0400 |
| commit | e9cef89702e2bde918102e784c6b75a7979e85d1 (patch) | |
| tree | 7eb62b52511661d3e0d8f272ca975d4c5d3b8c4a /libavformat/matroskaenc.c | |
| parent | 5d603f1b655ee717c6639fc2fcb2c13e4a925b6f (diff) | |
| download | ffmpeg-e9cef89702e2bde918102e784c6b75a7979e85d1.tar.gz | |
avformat: Add a flag to mark muxers that allow (non strict) monotone timestamps.
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
Diffstat (limited to 'libavformat/matroskaenc.c')
| -rw-r--r-- | libavformat/matroskaenc.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 9334b52d6d..61a91d7117 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1305,7 +1305,8 @@ AVOutputFormat ff_matroska_muxer = { .write_header = mkv_write_header, .write_packet = mkv_write_packet, .write_trailer = mkv_write_trailer, - .flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS, + .flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS | + AVFMT_TS_NONSTRICT, .codec_tag = (const AVCodecTag* const []){ ff_codec_bmp_tags, ff_codec_wav_tags, 0 }, @@ -1326,7 +1327,8 @@ AVOutputFormat ff_webm_muxer = { .write_header = mkv_write_header, .write_packet = mkv_write_packet, .write_trailer = mkv_write_trailer, - .flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS, + .flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS | + AVFMT_TS_NONSTRICT, }; #endif @@ -1346,7 +1348,7 @@ AVOutputFormat ff_matroska_audio_muxer = { .write_header = mkv_write_header, .write_packet = mkv_write_packet, .write_trailer = mkv_write_trailer, - .flags = AVFMT_GLOBALHEADER, + .flags = AVFMT_GLOBALHEADER | AVFMT_TS_NONSTRICT, .codec_tag = (const AVCodecTag* const []){ ff_codec_wav_tags, 0 }, }; #endif |