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;
                                             ^

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@16397 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/ffserver.c b/ffserver.c
index c48cb41592cda7e6186997d5a13e7619b6313b3d..665c23101c739389a13366fb84b176c07be85631 100644 (file)
--- a/ffserver.c
+++ b/ffserver.c
@@ -3686,7 +3686,7 @@ static void add_codec(FFStream *stream, AVCodecContext *av)
     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 *arg)
     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 *filename)
     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) {