diff options
| author | Anton Khirnov <wyskas@gmail.com> | 2008-06-01 13:39:54 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2008-06-01 13:39:54 +0000 |
| commit | cdae8eec1062e51059d67bb344b78d668b4c7b48 (patch) | |
| tree | 8b37b01d615bdeec2f352f10b7eff13af4c08a20 | |
| parent | a94701d03c107d90333884b70646583507c280d9 (diff) | |
| download | ffmpeg-cdae8eec1062e51059d67bb344b78d668b4c7b48.tar.gz | |
matroskadec: silently discard some element ID that we don't care about
patch by Anton Khirnov wyskas _at_ gmail _dot_ com
Originally committed as revision 13600 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/matroska.h | 3 | ||||
| -rw-r--r-- | libavformat/matroskadec.c | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/libavformat/matroska.h b/libavformat/matroska.h index 592e4b140d..630a824c71 100644 --- a/libavformat/matroska.h +++ b/libavformat/matroska.h @@ -82,10 +82,12 @@ #define MATROSKA_ID_CODECNAME 0x258688 #define MATROSKA_ID_CODECINFOURL 0x3B4040 #define MATROSKA_ID_CODECDOWNLOADURL 0x26B240 +#define MATROSKA_ID_CODECDECODEALL 0xAA #define MATROSKA_ID_TRACKNAME 0x536E #define MATROSKA_ID_TRACKLANGUAGE 0x22B59C #define MATROSKA_ID_TRACKFLAGENABLED 0xB9 #define MATROSKA_ID_TRACKFLAGDEFAULT 0x88 +#define MATROSKA_ID_TRACKFLAGFORCED 0x55AA #define MATROSKA_ID_TRACKFLAGLACING 0x9C #define MATROSKA_ID_TRACKMINCACHE 0x6DE7 #define MATROSKA_ID_TRACKMAXCACHE 0x6DF8 @@ -165,6 +167,7 @@ #define MATROSKA_ID_CHAPSTRING 0x85 #define MATROSKA_ID_EDITIONUID 0x45BC #define MATROSKA_ID_EDITIONFLAGHIDDEN 0x45BD +#define MATROSKA_ID_EDITIONFLAGDEFAULT 0x45DB #define MATROSKA_ID_CHAPTERUID 0x73C4 #define MATROSKA_ID_CHAPTERFLAGHIDDEN 0x98 diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index f080bd1cd3..37c11403f9 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -996,6 +996,7 @@ matroska_parse_info (MatroskaDemuxContext *matroska) "Unknown entry 0x%x in info header\n", id); /* fall-through */ + case MATROSKA_ID_SEGMENTUID: case EBML_ID_VOID: res = ebml_read_skip(matroska); break; @@ -1595,6 +1596,8 @@ matroska_add_stream (MatroskaDemuxContext *matroska) case EBML_ID_VOID: /* we ignore these because they're nothing useful. */ + case MATROSKA_ID_TRACKFLAGFORCED: + case MATROSKA_ID_CODECDECODEALL: case MATROSKA_ID_CODECINFOURL: case MATROSKA_ID_CODECDOWNLOADURL: case MATROSKA_ID_TRACKMINCACHE: @@ -2080,6 +2083,7 @@ matroska_parse_attachments(AVFormatContext *s) default: av_log(matroska->ctx, AV_LOG_INFO, "Unknown attachedfile ID 0x%x\n", id); + case MATROSKA_ID_FILEUID: case EBML_ID_VOID: res = ebml_read_skip(matroska); break; @@ -2264,6 +2268,7 @@ matroska_parse_chapters(AVFormatContext *s) av_log(s, AV_LOG_INFO, "Ignoring unknown Edition entry ID 0x%x\n", id); case MATROSKA_ID_EDITIONUID: case MATROSKA_ID_EDITIONFLAGHIDDEN: + case MATROSKA_ID_EDITIONFLAGDEFAULT: case EBML_ID_VOID: res = ebml_read_skip(matroska); break; |