Author: cehoyos Date: Tue Dec 30 13:02:35 2008 New Revision: 16397 Log: Silence two icc warnings: /home/melanson/fate/source/ffserver.c(4349): warning #188: enumerated type mixed with another type audio_enc.codec_id = audio_id; ^ /home/melanson/fate/source/ffserver.c(4354): warning #188: enumerated type mixed with another type video_enc.codec_id = video_id; ^ Modified: trunk/ffserver.c Modified: trunk/ffserver.c ============================================================================== --- trunk/ffserver.c Tue Dec 30 09:47:52 2008 (r16396) +++ trunk/ffserver.c Tue Dec 30 13:02:35 2008 (r16397) @@ -3686,7 +3686,7 @@ static void add_codec(FFStream *stream, memcpy(st->codec, av, sizeof(AVCodecContext)); } -static int opt_audio_codec(const char *arg) +static enum CodecID opt_audio_codec(const char *arg) { AVCodec *p= avcodec_find_encoder_by_name(arg); @@ -3696,7 +3696,7 @@ static int opt_audio_codec(const char *a return p->id; } -static int opt_video_codec(const char *arg) +static enum CodecID opt_video_codec(const char *arg) { AVCodec *p= avcodec_find_encoder_by_name(arg); @@ -3753,7 +3753,7 @@ static int parse_ffconfig(const char *fi FFStream **last_stream, *stream, *redirect; FFStream **last_feed, *feed; AVCodecContext audio_enc, video_enc; - int audio_id, video_id; + enum CodecID audio_id, video_id; f = fopen(filename, "r"); if (!f) {
participants (1)
-
subversion@mplayerhq.hu