diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-05-15 15:48:15 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-05-27 21:25:53 +0200 |
| commit | 564b7e0c0095768cd20001b28154d69462be54e7 (patch) | |
| tree | 3b46859474deee486b5d81ee8a43c5ddc08a8a9a | |
| parent | c3c08baefbf8c9b19c9c1f1bd7a899b697422eea (diff) | |
| download | ffmpeg-564b7e0c0095768cd20001b28154d69462be54e7.tar.gz | |
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.
| -rw-r--r-- | libavformat/matroska.h | 1 | ||||
| -rw-r--r-- | libavformat/matroskadec.c | 1 |
2 files changed, 2 insertions, 0 deletions
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 diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 744f7c0f6c..3b801e0845 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -500,6 +500,7 @@ static EbmlSyntax matroska_blockgroup[] = { { 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 } }; |