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

[cehoyos]

Author: cehoyos
Date: Tue May 13 17:42:27 2008
New Revision: 13143

Log:
Add MATROSKA_TRACK_TYPE_NONE.
Fixes icc warning #188: enumerated type mixed with another type


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

Modified: trunk/libavformat/matroska.h
==============================================================================
--- trunk/libavformat/matroska.h	(original)
+++ trunk/libavformat/matroska.h	Tue May 13 17:42:27 2008
@@ -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,

Modified: trunk/libavformat/matroskadec.c
==============================================================================
--- trunk/libavformat/matroskadec.c	(original)
+++ trunk/libavformat/matroskadec.c	Tue May 13 17:42:27 2008
@@ -1075,7 +1075,7 @@ matroska_add_stream (MatroskaDemuxContex
                         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;