Add MATROSKA_TRACK_TYPE_NONE.

Fixes icc warning #188: enumerated type mixed with another type

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@13143 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/libavformat/matroska.h b/libavformat/matroska.h
index 6f48f04723e475c4afa1c064e878b06cec7b995b..c4a5c23274cb6a1328a018da6f8edffaf9e155f4 100644 (file)
--- a/libavformat/matroska.h
+++ b/libavformat/matroska.h
@@ -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,

diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 6a9d1abb5e1a1bc2d3719727bae81e68991886e8..e71ea3a95955af0fefa075598e937b83f3f37d58 100644 (file)
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -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;