From 340e2303924db326817c5b47a9424623ac1401f1 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Sat, 4 Jul 2009 08:18:03 +0000 Subject: Use enum CodecID instead of int. Fixes the following icc warning: warning #188: enumerated type mixed with another type Originally committed as revision 19340 to svn://svn.ffmpeg.org/ffmpeg/trunk --- ffmpeg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ffmpeg.c') diff --git a/ffmpeg.c b/ffmpeg.c index 18bf949394..22bfed8dc2 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -3051,7 +3051,7 @@ static void new_video_stream(AVFormatContext *oc) { AVStream *st; AVCodecContext *video_enc; - int codec_id; + enum CodecID codec_id; st = av_new_stream(oc, oc->nb_streams); if (!st) { @@ -3193,7 +3193,7 @@ static void new_audio_stream(AVFormatContext *oc) { AVStream *st; AVCodecContext *audio_enc; - int codec_id; + enum CodecID codec_id; st = av_new_stream(oc, oc->nb_streams); if (!st) { -- cgit v1.2.3