diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-18 12:01:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-18 12:40:22 +0200 |
| commit | 45975ab7a192d7c687e77342de2ddfebb3b2fa4d (patch) | |
| tree | 67b1494f621a73ab969ffa28f5c02a5d05ab4e03 | |
| parent | 66722b4ba955eebef77045644a082505cfa134fa (diff) | |
| parent | 0a14fefd68cc18ce3252edff8a05ee9b3945b694 (diff) | |
| download | ffmpeg-45975ab7a192d7c687e77342de2ddfebb3b2fa4d.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
movenc: Indicate that negative timestamps are supported
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -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 5e0e25d971..7212cb248a 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -4050,7 +4050,7 @@ AVOutputFormat ff_psp_muxer = { .write_header = mov_write_header, .write_packet = mov_write_packet, .write_trailer = mov_write_trailer, - .flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH, + .flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH | AVFMT_TS_NEGATIVE, .codec_tag = (const AVCodecTag* const []){ ff_mp4_obj_type, 0 }, .priv_class = &psp_muxer_class, }; @@ -4103,7 +4103,7 @@ AVOutputFormat ff_ismv_muxer = { .write_header = mov_write_header, .write_packet = mov_write_packet, .write_trailer = mov_write_trailer, - .flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH, + .flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH | AVFMT_TS_NEGATIVE, .codec_tag = (const AVCodecTag* const []){ ff_mp4_obj_type, 0 }, .priv_class = &ismv_muxer_class, }; |