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
pull/126/head
Carl Eugen Hoyos 17 years ago
parent 54d2d4f698
commit e3227b3f25
  1. 1
      libavformat/matroska.h
  2. 2
      libavformat/matroskadec.c

@ -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)
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;

Loading…
Cancel
Save