diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-28 08:04:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-28 08:04:02 +0200 |
| commit | 91db8ff203048e3d6fed589e8352d3a5407d4302 (patch) | |
| tree | 7d770c4048628cb98bc8bbbf9fee45b088711345 /libavformat/matroska.h | |
| parent | 97f7586cd6a1c3741258d6d70b3cbbbde15b1618 (diff) | |
| parent | 564b7e0c0095768cd20001b28154d69462be54e7 (diff) | |
Merge commit '564b7e0c0095768cd20001b28154d69462be54e7'
* commit '564b7e0c0095768cd20001b28154d69462be54e7':
matroskadec: silently skip CodecState element.
smacker: fix off-by-one error in palette expanding code
Conflicts:
libavformat/smacker.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/matroska.h')
| -rw-r--r-- | libavformat/matroska.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/matroska.h b/libavformat/matroska.h index 8a7e10b64d..af662bea4d 100644 --- a/libavformat/matroska.h +++ b/libavformat/matroska.h @@ -195,6 +195,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 |