/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
memcpy(st->codec, av, sizeof(AVCodecContext));
}
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);
{
AVCodec *p= avcodec_find_encoder_by_name(arg);
-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);
{
AVCodec *p= avcodec_find_encoder_by_name(arg);
FFStream **last_stream, *stream, *redirect;
FFStream **last_feed, *feed;
AVCodecContext audio_enc, video_enc;
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) {
f = fopen(filename, "r");
if (!f) {