Commit 2b7b80c2 authored by cehoyos's avatar cehoyos

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
parent 16781ec1
...@@ -156,6 +156,7 @@ ...@@ -156,6 +156,7 @@
#define MATROSKA_ID_FILEUID 0x46AE #define MATROSKA_ID_FILEUID 0x46AE
typedef enum { typedef enum {
MATROSKA_TRACK_TYPE_NONE = 0x0,
MATROSKA_TRACK_TYPE_VIDEO = 0x1, MATROSKA_TRACK_TYPE_VIDEO = 0x1,
MATROSKA_TRACK_TYPE_AUDIO = 0x2, MATROSKA_TRACK_TYPE_AUDIO = 0x2,
MATROSKA_TRACK_TYPE_COMPLEX = 0x3, MATROSKA_TRACK_TYPE_COMPLEX = 0x3,
......
...@@ -1075,7 +1075,7 @@ matroska_add_stream (MatroskaDemuxContext *matroska) ...@@ -1075,7 +1075,7 @@ matroska_add_stream (MatroskaDemuxContext *matroska)
av_log(matroska->ctx, AV_LOG_INFO, av_log(matroska->ctx, AV_LOG_INFO,
"Unknown or unsupported track type 0x%x\n", "Unknown or unsupported track type 0x%x\n",
track->type); track->type);
track->type = 0; track->type = MATROSKA_TRACK_TYPE_NONE;
break; break;
} }
matroska->tracks[matroska->num_tracks - 1] = track; matroska->tracks[matroska->num_tracks - 1] = track;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment