Merge commit 'f792d3cbb8e8e35c54a9358a55dd596b7a40f228'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 18 Jun 2014 15:28:10 +0000 (17:28 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 18 Jun 2014 15:28:10 +0000 (17:28 +0200)
* commit 'f792d3cbb8e8e35c54a9358a55dd596b7a40f228':
  lavf: add the notimestamps flag to the muxers missing it

Conflicts:
libavformat/adtsenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/adtsenc.c
libavformat/amr.c
libavformat/au.c
libavformat/latmenc.c
libavformat/mpjpeg.c
libavformat/omaenc.c
libavformat/rsoenc.c
libavformat/soxenc.c
libavformat/vocenc.c

@@@ -200,6 -172,5 +200,7 @@@ AVOutputFormat ff_adts_muxer = 
      .video_codec       = AV_CODEC_ID_NONE,
      .write_header      = adts_write_header,
      .write_packet      = adts_write_packet,
 +    .write_trailer     = adts_write_trailer,
 +    .priv_class        = &adts_muxer_class,
+     .flags             = AVFMT_NOTIMESTAMPS,
  };
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -116,6 -123,7 +116,7 @@@ AVOutputFormat ff_sox_muxer = 
      .audio_codec       = AV_CODEC_ID_PCM_S32LE,
      .video_codec       = AV_CODEC_ID_NONE,
      .write_header      = sox_write_header,
 -    .write_packet      = sox_write_packet,
 +    .write_packet      = ff_raw_write_packet,
      .write_trailer     = sox_write_trailer,
+     .flags             = AVFMT_NOTIMESTAMPS,
  };
Simple merge