aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2011-10-12 11:30:16 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2011-10-12 11:30:16 +0200
commit9f70057dd6d1737dd363017027c3b35512c23c27 (patch)
treebf6a61423658abefe202ce432794d51867adf242 /libavformat
parent7d12b065746d4f5eabe11373d406372308f47b6c (diff)
downloadffmpeg-9f70057dd6d1737dd363017027c3b35512c23c27.tar.gz
Do not set codec_tag property for matroska muxers.
Fixes tickets #8, #537.
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/matroskaenc.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index ecc5e6bbb3..63edb815e1 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -1211,7 +1211,6 @@ AVOutputFormat ff_matroska_muxer = {
.write_packet = mkv_write_packet,
.write_trailer = mkv_write_trailer,
.flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS,
- .codec_tag = (const AVCodecTag* const []){ff_codec_bmp_tags, ff_codec_wav_tags, 0},
.subtitle_codec = CODEC_ID_SSA,
};
#endif
@@ -1245,6 +1244,5 @@ AVOutputFormat ff_matroska_audio_muxer = {
.write_packet = mkv_write_packet,
.write_trailer = mkv_write_trailer,
.flags = AVFMT_GLOBALHEADER,
- .codec_tag = (const AVCodecTag* const []){ff_codec_wav_tags, 0},
};
#endif