From aed464654bda3d9a9ed33d5fcc3d48681b076b92 Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at>
Date: Tue, 30 Dec 2008 12:02:35 +0000
Subject: [PATCH] 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;
^
Originally committed as revision 16397 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
ffserver.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/ffserver.c b/ffserver.c
index c48cb41592c..665c23101c7 100644
--- 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) {
--
GitLab