Browse Source

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  movenc: Indicate that negative timestamps are supported

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.1
Michael Niedermayer 12 years ago
parent
commit
45975ab7a1
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      libavformat/movenc.c

+ 2
- 2
libavformat/movenc.c View File

@@ -4050,7 +4050,7 @@ AVOutputFormat ff_psp_muxer = {
.write_header = mov_write_header, .write_header = mov_write_header,
.write_packet = mov_write_packet, .write_packet = mov_write_packet,
.write_trailer = mov_write_trailer, .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 }, .codec_tag = (const AVCodecTag* const []){ ff_mp4_obj_type, 0 },
.priv_class = &psp_muxer_class, .priv_class = &psp_muxer_class,
}; };
@@ -4103,7 +4103,7 @@ AVOutputFormat ff_ismv_muxer = {
.write_header = mov_write_header, .write_header = mov_write_header,
.write_packet = mov_write_packet, .write_packet = mov_write_packet,
.write_trailer = mov_write_trailer, .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 }, .codec_tag = (const AVCodecTag* const []){ ff_mp4_obj_type, 0 },
.priv_class = &ismv_muxer_class, .priv_class = &ismv_muxer_class,
}; };


Loading…
Cancel
Save