Browse code

Merge commit 'f792d3cbb8e8e35c54a9358a55dd596b7a40f228'

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

Conflicts:
libavformat/adtsenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Michael Niedermayer authored on 2014/06/19 00:28:10
Showing 9 changed files
... ...
@@ -202,4 +202,5 @@ AVOutputFormat ff_adts_muxer = {
202 202
     .write_packet      = adts_write_packet,
203 203
     .write_trailer     = adts_write_trailer,
204 204
     .priv_class        = &adts_muxer_class,
205
+    .flags             = AVFMT_NOTIMESTAMPS,
205 206
 };
... ...
@@ -184,5 +184,6 @@ AVOutputFormat ff_amr_muxer = {
184 184
     .video_codec       = AV_CODEC_ID_NONE,
185 185
     .write_header      = amr_write_header,
186 186
     .write_packet      = amr_write_packet,
187
+    .flags             = AVFMT_NOTIMESTAMPS,
187 188
 };
188 189
 #endif
... ...
@@ -220,6 +220,7 @@ AVOutputFormat ff_au_muxer = {
220 220
     .write_packet  = ff_raw_write_packet,
221 221
     .write_trailer = au_write_trailer,
222 222
     .codec_tag     = (const AVCodecTag* const []) { codec_au_tags, 0 },
223
+    .flags         = AVFMT_NOTIMESTAMPS,
223 224
 };
224 225
 
225 226
 #endif /* CONFIG_AU_MUXER */
... ...
@@ -227,4 +227,5 @@ AVOutputFormat ff_latm_muxer = {
227 227
     .write_header   = latm_write_header,
228 228
     .write_packet   = latm_write_packet,
229 229
     .priv_class     = &latm_muxer_class,
230
+    .flags          = AVFMT_NOTIMESTAMPS,
230 231
 };
... ...
@@ -65,4 +65,5 @@ AVOutputFormat ff_mpjpeg_muxer = {
65 65
     .write_header      = mpjpeg_write_header,
66 66
     .write_packet      = mpjpeg_write_packet,
67 67
     .write_trailer     = mpjpeg_write_trailer,
68
+    .flags             = AVFMT_NOTIMESTAMPS,
68 69
 };
... ...
@@ -103,4 +103,5 @@ AVOutputFormat ff_oma_muxer = {
103 103
     .write_header      = oma_write_header,
104 104
     .write_packet      = ff_raw_write_packet,
105 105
     .codec_tag         = (const AVCodecTag* const []){ff_oma_codec_tags, 0},
106
+    .flags             = AVFMT_NOTIMESTAMPS,
106 107
 };
... ...
@@ -108,4 +108,5 @@ AVOutputFormat ff_rso_muxer = {
108 108
     .write_packet   =   rso_write_packet,
109 109
     .write_trailer  =   rso_write_trailer,
110 110
     .codec_tag      =   (const AVCodecTag* const []){ff_codec_rso_tags, 0},
111
+    .flags          =   AVFMT_NOTIMESTAMPS,
111 112
 };
... ...
@@ -118,4 +118,5 @@ AVOutputFormat ff_sox_muxer = {
118 118
     .write_header      = sox_write_header,
119 119
     .write_packet      = ff_raw_write_packet,
120 120
     .write_trailer     = sox_write_trailer,
121
+    .flags             = AVFMT_NOTIMESTAMPS,
121 122
 };
... ...
@@ -107,4 +107,5 @@ AVOutputFormat ff_voc_muxer = {
107 107
     .write_packet      = voc_write_packet,
108 108
     .write_trailer     = voc_write_trailer,
109 109
     .codec_tag         = (const AVCodecTag* const []){ ff_voc_codec_tags, 0 },
110
+    .flags             = AVFMT_NOTIMESTAMPS,
110 111
 };