Mercurial > libavformat.hg

changeset 3290:fa502e142b44 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add MATROSKA_TRACK_TYPE_NONE. Fixes icc warning #188: enumerated type mixed with another type
author cehoyos
date Tue, 13 May 2008 15:42:27 +0000
parents 811c78fac294
children fb5f48e1956f
files matroska.h matroskadec.c
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/matroska.h	Mon May 12 10:30:40 2008 +0000
+++ b/matroska.h	Tue May 13 15:42:27 2008 +0000
@@ -156,6 +156,7 @@
 #define MATROSKA_ID_FILEUID             0x46AE
 
 typedef enum {
+  MATROSKA_TRACK_TYPE_NONE     = 0x0,
   MATROSKA_TRACK_TYPE_VIDEO    = 0x1,
   MATROSKA_TRACK_TYPE_AUDIO    = 0x2,
   MATROSKA_TRACK_TYPE_COMPLEX  = 0x3,
--- a/matroskadec.c	Mon May 12 10:30:40 2008 +0000
+++ b/matroskadec.c	Tue May 13 15:42:27 2008 +0000
@@ -1075,7 +1075,7 @@
                         av_log(matroska->ctx, AV_LOG_INFO,
                                "Unknown or unsupported track type 0x%x\n",
                                track->type);
-                        track->type = 0;
+                        track->type = MATROSKA_TRACK_TYPE_NONE;
                         break;
                 }
                 matroska->tracks[matroska->num_tracks - 1] = track;