aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2011-08-28 23:13:17 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2011-10-09 20:10:26 +0200
commit638e183d11367f0ccc46bee6228e5b271fda5a8e (patch)
treebb8bbb5b159ae575fc6f090daf40cbfecf8edbbf
parent57f51e843e55815da5bb75ed32a81f60b7b45212 (diff)
downloadffmpeg-638e183d11367f0ccc46bee6228e5b271fda5a8e.tar.gz
Do not set codec_tag property for matroska muxers.
Fixes ticket #8, #537. (cherry picked from commit 60171d8fa68e90bd623daba970a65c4171cac502)
-rw-r--r--libavformat/matroskaenc.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index e9c977a59f..986373c4cd 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -1209,7 +1209,6 @@ AVOutputFormat ff_matroska_muxer = {
mkv_write_packet,
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_TEXT,
};
#endif
@@ -1243,6 +1242,5 @@ AVOutputFormat ff_matroska_audio_muxer = {
mkv_write_packet,
mkv_write_trailer,
.flags = AVFMT_GLOBALHEADER,
- .codec_tag = (const AVCodecTag* const []){ff_codec_wav_tags, 0},
};
#endif