Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / matroska.h

diff --git a/libavformat/matroska.h b/libavformat/matroska.h
index 6f6ab1e92953f1a3ba13dd702c9fcf40cbe8750c..9af709f215ef29bb798431c30936f89e76761cde 100644 (file)
--- a/libavformat/matroska.h
+++ b/libavformat/matroska.h
@@ -248,7 +248,7 @@ typedef enum {
 
 typedef struct CodecTags{
     char str[20];
-    enum CodecID id;
+    enum AVCodecID id;
 }CodecTags;
 
 /* max. depth in the EBML tree structure */