diff options
| author | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2008-05-13 15:42:27 +0000 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2008-05-13 15:42:27 +0000 |
| commit | e3227b3f25d8dacba271dd60c07e7302a8272f5d (patch) | |
| tree | c6a66933512d90d1d01ae6ada384170fbafdbcea /libavformat | |
| parent | 54d2d4f698bb04464b061273d7c45d9362343b29 (diff) | |
| download | ffmpeg-e3227b3f25d8dacba271dd60c07e7302a8272f5d.tar.gz | |
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
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/matroska.h | 1 | ||||
| -rw-r--r-- | libavformat/matroskadec.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/matroska.h b/libavformat/matroska.h index 6f48f04723..c4a5c23274 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 6a9d1abb5e..e71ea3a959 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; |