diff options
| author | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2008-12-22 22:10:07 +0000 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2008-12-22 22:10:07 +0000 |
| commit | 1c53290b6739bdc13db9f5eac6f9b8e906557f5f (patch) | |
| tree | bd7ec3a516493e0bedf3fb5ee9b5eae5028082d2 | |
| parent | ec3686e8890f3d0bc7e6a9a42886f28034cbbb07 (diff) | |
| download | ffmpeg-1c53290b6739bdc13db9f5eac6f9b8e906557f5f.tar.gz | |
Fix a warning when compiling with icc:
warning #188: enumerated type mixed with another type
Originally committed as revision 16280 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/ipmovie.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/ipmovie.c b/libavformat/ipmovie.c index 4a766b2cde..35c61ded9d 100644 --- a/libavformat/ipmovie.c +++ b/libavformat/ipmovie.c @@ -101,7 +101,7 @@ typedef struct IPMVEContext { unsigned int audio_bits; unsigned int audio_channels; unsigned int audio_sample_rate; - unsigned int audio_type; + enum CodecID audio_type; unsigned int audio_frame_count; int video_stream_index; @@ -544,7 +544,7 @@ static int ipmovie_read_header(AVFormatContext *s, url_fseek(pb, -CHUNK_PREAMBLE_SIZE, SEEK_CUR); if (chunk_type == CHUNK_VIDEO) - ipmovie->audio_type = 0; /* no audio */ + ipmovie->audio_type = CODEC_ID_NONE; /* no audio */ else if (process_ipmovie_chunk(ipmovie, pb, &pkt) != CHUNK_INIT_AUDIO) return AVERROR_INVALIDDATA; |