diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-01-24 02:30:40 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-01-24 02:39:28 +0100 |
| commit | ebb3a5974fe399b43271d5ed91d69dcafc448b01 (patch) | |
| tree | a4bc22a1cafa30fbd649676e799b5d744dae10d7 /libavformat/matroska.c | |
| parent | 91e016865cccc192f86d40ea93eb06cf0e7ba4a0 (diff) | |
| download | ffmpeg-ebb3a5974fe399b43271d5ed91d69dcafc448b01.tar.gz | |
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.
(cherry picked from commit df39c3ce385c02cbd8046298578ea7454c0a0f81)
Conflicts:
libavformat/matroskaenc.c
Diffstat (limited to 'libavformat/matroska.c')
| -rw-r--r-- | libavformat/matroska.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/matroska.c b/libavformat/matroska.c index 52481d7556..a5a4363cc0 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" , CODEC_ID_AAC}, {"A_AC3" , CODEC_ID_AC3}, |