From df39c3ce385c02cbd8046298578ea7454c0a0f81 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Thu, 24 Jan 2013 00:53:50 +0100 Subject: matroskaenc: add codec_tag lists back. This reverts 312645e : "Do not set codec_tag property for matroska muxers." Also adds dummy codec_tag lists with codecs supported in mkv but not in wav / avi. Fixes ticket #2169. --- libavformat/matroska.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'libavformat/matroska.c') diff --git a/libavformat/matroska.c b/libavformat/matroska.c index db9c2bb1ed..394a62f9d3 100644 --- a/libavformat/matroska.c +++ b/libavformat/matroska.c @@ -21,6 +21,9 @@ #include "matroska.h" +/* If you add a tag here that is not in ff_codec_bmp_tags[] + or ff_codec_wav_tags[], add it also to additional_audio_tags[] + or additional_video_tags[] in matroskaenc.c */ const CodecTags ff_mkv_codec_tags[]={ {"A_AAC" , AV_CODEC_ID_AAC}, {"A_AC3" , AV_CODEC_ID_AC3}, -- cgit v1.2.3