MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'f792d3cbb8e8e35c54a9358a55dd596b7a40f228'

Browse Source 
* commit 'f792d3cbb8e8e35c54a9358a55dd596b7a40f228':
  lavf: add the notimestamps flag to the muxers missing it

Conflicts:
	libavformat/adtsenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-06-18 17:28:10 +02:00
commit 95398aa949
9 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavformat/adtsenc.c
View File

@ -202,4 +202,5 @@ AVOutputFormat ff_adts_muxer = {
.write_packet = adts_write_packet,
.write_trailer = adts_write_trailer,
.priv_class = &adts_muxer_class,
.flags = AVFMT_NOTIMESTAMPS,
};

1
libavformat/amr.c
View File

@ -184,5 +184,6 @@ AVOutputFormat ff_amr_muxer = {
.video_codec = AV_CODEC_ID_NONE,
.write_header = amr_write_header,
.write_packet = amr_write_packet,
.flags = AVFMT_NOTIMESTAMPS,
};
#endif

1
libavformat/au.c
View File

@ -220,6 +220,7 @@ AVOutputFormat ff_au_muxer = {
.write_packet = ff_raw_write_packet,
.write_trailer = au_write_trailer,
.codec_tag = (const AVCodecTag* const []) { codec_au_tags, 0 },
.flags = AVFMT_NOTIMESTAMPS,
};
#endif /* CONFIG_AU_MUXER */

1
libavformat/latmenc.c
View File

@ -227,4 +227,5 @@ AVOutputFormat ff_latm_muxer = {
.write_header = latm_write_header,
.write_packet = latm_write_packet,
.priv_class = &latm_muxer_class,
.flags = AVFMT_NOTIMESTAMPS,
};

1
libavformat/mpjpeg.c
View File

@ -65,4 +65,5 @@ AVOutputFormat ff_mpjpeg_muxer = {
.write_header = mpjpeg_write_header,
.write_packet = mpjpeg_write_packet,
.write_trailer = mpjpeg_write_trailer,
.flags = AVFMT_NOTIMESTAMPS,
};

1
libavformat/omaenc.c
View File

@ -103,4 +103,5 @@ AVOutputFormat ff_oma_muxer = {
.write_header = oma_write_header,
.write_packet = ff_raw_write_packet,
.codec_tag = (const AVCodecTag* const []){ff_oma_codec_tags, 0},
.flags = AVFMT_NOTIMESTAMPS,
};

1
libavformat/rsoenc.c
View File

@ -108,4 +108,5 @@ AVOutputFormat ff_rso_muxer = {
.write_packet = rso_write_packet,
.write_trailer = rso_write_trailer,
.codec_tag = (const AVCodecTag* const []){ff_codec_rso_tags, 0},
.flags = AVFMT_NOTIMESTAMPS,
};

1
libavformat/soxenc.c
View File

@ -118,4 +118,5 @@ AVOutputFormat ff_sox_muxer = {
.write_header = sox_write_header,
.write_packet = ff_raw_write_packet,
.write_trailer = sox_write_trailer,
.flags = AVFMT_NOTIMESTAMPS,
};

1
libavformat/vocenc.c
View File

@ -107,4 +107,5 @@ AVOutputFormat ff_voc_muxer = {
.write_packet = voc_write_packet,
.write_trailer = voc_write_trailer,
.codec_tag = (const AVCodecTag* const []){ ff_voc_codec_tags, 0 },
.flags = AVFMT_NOTIMESTAMPS,
};