Merge commit '7fa72700298107fe756311ecb4dee5270ff12d35' into release/0.10
[ffmpeg.git] / libavformat / matroska.c
index 52481d7..a5a4363 100644 (file)
@@ -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},