Add MATROSKA_TRACK_TYPE_NONE.
authorCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>
Tue, 13 May 2008 15:42:27 +0000 (15:42 +0000)
committerCarl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>
Tue, 13 May 2008 15:42:27 +0000 (15:42 +0000)
Fixes icc warning #188: enumerated type mixed with another type

Originally committed as revision 13143 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavformat/matroska.h
libavformat/matroskadec.c

index 6f48f04..c4a5c23 100644 (file)
 #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,
index 6a9d1ab..e71ea3a 100644 (file)
@@ -1075,7 +1075,7 @@ matroska_add_stream (MatroskaDemuxContext *matroska)
                         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;