[FFmpeg-cvslog] r13600 - in trunk/libavformat: matroska.h matroskadec.c

[aurel]

Author: aurel
Date: Sun Jun  1 15:39:54 2008
New Revision: 13600

Log:
matroskadec: silently discard some element ID that we don't care about
patch by Anton Khirnov   wyskas _at_ gmail _dot_ com


Modified:
   trunk/libavformat/matroska.h
   trunk/libavformat/matroskadec.c

Modified: trunk/libavformat/matroska.h
==============================================================================
--- trunk/libavformat/matroska.h	(original)
+++ trunk/libavformat/matroska.h	Sun Jun  1 15:39:54 2008
@@ -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
 

Modified: trunk/libavformat/matroskadec.c
==============================================================================
--- trunk/libavformat/matroskadec.c	(original)
+++ trunk/libavformat/matroskadec.c	Sun Jun  1 15:39:54 2008
@@ -996,6 +996,7 @@ matroska_parse_info (MatroskaDemuxContex
                        "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 (MatroskaDemuxContex
 
             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(AVFormatConte
                 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 
                     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;