From: Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>
Date: Tue, 13 May 2008 15:42:27 +0000 (+0000)
Subject: Add MATROSKA_TRACK_TYPE_NONE.
X-Git-Tag: v0.5~4788
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e3227b3f25d8dacba271dd60c07e7302a8272f5d;p=coroid%2Fffmpeg_saccubus.git

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

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

diff --git a/libavformat/matroska.h b/libavformat/matroska.h
index 6f48f0472..c4a5c2327 100644
--- 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 6a9d1abb5..e71ea3a95 100644
--- 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;