From 564b7e0c0095768cd20001b28154d69462be54e7 Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Wed, 15 May 2013 15:48:15 +0200
Subject: matroskadec: silently skip CodecState element.

mkvmerge apparrently uses it for mpeg1/2 video, but it contains the same
information as CodecPrivate, so it can be ignored.
---
 libavformat/matroska.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'libavformat/matroska.h')

diff --git a/libavformat/matroska.h b/libavformat/matroska.h
index b1f7ae4ed5..0dbc724d56 100644
--- a/libavformat/matroska.h
+++ b/libavformat/matroska.h
@@ -176,6 +176,7 @@
 #define MATROSKA_ID_BLOCK      0xA1
 #define MATROSKA_ID_BLOCKDURATION 0x9B
 #define MATROSKA_ID_BLOCKREFERENCE 0xFB
+#define MATROSKA_ID_CODECSTATE 0xA4
 
 /* IDs in the attachments master */
 #define MATROSKA_ID_ATTACHEDFILE        0x61A7
-- 
cgit v1.2.3