aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-06-18 17:28:10 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-06-18 17:28:10 +0200
commit95398aa9499bfad3330b47001b7eb086c31b0cd6 (patch)
tree0528f2243eea14e91cacc290ae713d2c2d4aa49d
parentbd148ce07de08dcd03178e869bacf1e1ef6358df (diff)
parentf792d3cbb8e8e35c54a9358a55dd596b7a40f228 (diff)
downloadffmpeg-95398aa9499bfad3330b47001b7eb086c31b0cd6.tar.gz
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>
-rw-r--r--libavformat/adtsenc.c1
-rw-r--r--libavformat/amr.c1
-rw-r--r--libavformat/au.c1
-rw-r--r--libavformat/latmenc.c1
-rw-r--r--libavformat/mpjpeg.c1
-rw-r--r--libavformat/omaenc.c1
-rw-r--r--libavformat/rsoenc.c1
-rw-r--r--libavformat/soxenc.c1
-rw-r--r--libavformat/vocenc.c1
9 files changed, 9 insertions, 0 deletions
diff --git a/libavformat/adtsenc.c b/libavformat/adtsenc.c
index f25f966129..58a7f2d89a 100644
--- a/libavformat/adtsenc.c
+++ b/libavformat/adtsenc.c
@@ -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,
};
diff --git a/libavformat/amr.c b/libavformat/amr.c
index 6001525530..24d5ce0d76 100644
--- a/libavformat/amr.c
+++ b/libavformat/amr.c
@@ -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
diff --git a/libavformat/au.c b/libavformat/au.c
index edf0f32f00..53702bcb42 100644
--- a/libavformat/au.c
+++ b/libavformat/au.c
@@ -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 */
diff --git a/libavformat/latmenc.c b/libavformat/latmenc.c
index e69de2b122..cb79e84a91 100644
--- a/libavformat/latmenc.c
+++ b/libavformat/latmenc.c
@@ -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,
};
diff --git a/libavformat/mpjpeg.c b/libavformat/mpjpeg.c
index 2586ea8eb4..a6e2a89c7b 100644
--- a/libavformat/mpjpeg.c
+++ b/libavformat/mpjpeg.c
@@ -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,
};
diff --git a/libavformat/omaenc.c b/libavformat/omaenc.c
index b947987234..fe0669f5c9 100644
--- a/libavformat/omaenc.c
+++ b/libavformat/omaenc.c
@@ -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,
};
diff --git a/libavformat/rsoenc.c b/libavformat/rsoenc.c
index ee679b68f7..6da9594fcb 100644
--- a/libavformat/rsoenc.c
+++ b/libavformat/rsoenc.c
@@ -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,
};
diff --git a/libavformat/soxenc.c b/libavformat/soxenc.c
index e219d75b41..01ebe9c6af 100644
--- a/libavformat/soxenc.c
+++ b/libavformat/soxenc.c
@@ -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,
};
diff --git a/libavformat/vocenc.c b/libavformat/vocenc.c
index 29e9363492..0bb532e0c6 100644
--- a/libavformat/vocenc.c
+++ b/libavformat/vocenc.c
@@ -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,
};