commit 564b7e0c0095768cd20001b28154d69462be54e7
author Anton Khirnov <anton@khirnov.net> Wed May 15 13:48:15 2013
committer Anton Khirnov <anton@khirnov.net> Mon May 27 19:25:53 2013
tree 3b46859474deee486b5d81ee8a43c5ddc08a8a9a
parent c3c08baefbf8c9b19c9c1f1bd7a899b697422eea

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/matroskadec.c

diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 744f7c0..3b801e0 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -500,6 +500,7 @@
     { MATROSKA_ID_SIMPLEBLOCK,    EBML_BIN,  0, offsetof(MatroskaBlock,bin) },
     { MATROSKA_ID_BLOCKDURATION,  EBML_UINT, 0, offsetof(MatroskaBlock,duration), {.u=AV_NOPTS_VALUE} },
     { MATROSKA_ID_BLOCKREFERENCE, EBML_UINT, 0, offsetof(MatroskaBlock,reference) },
+    { MATROSKA_ID_CODECSTATE,     EBML_NONE },
     { 1,                          EBML_UINT, 0, offsetof(MatroskaBlock,non_simple), {.u=1} },
     { 0 }
 };