From df1a4b11342050086bc9724c636f19971cec825c Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 28 Sep 2008 19:33:19 +0000 Subject: [PATCH] Rename opt_default() so it will not conflict with the one from ffmpeg.c when it is moved to cmdutils.c/h. Originally committed as revision 15449 to svn://svn.ffmpeg.org/ffmpeg/trunk --- ffserver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ffserver.c b/ffserver.c index c91bd64099..5e18970ca7 100644 --- a/ffserver.c +++ b/ffserver.c @@ -3732,7 +3732,7 @@ static void load_module(const char *filename) } #endif -static int opt_default(const char *opt, const char *arg, +static int ffserver_opt_default(const char *opt, const char *arg, AVCodecContext *avctx, int type) { const AVOption *o = NULL; @@ -4179,7 +4179,7 @@ static int parse_ffconfig(const char *filename) avctx = &audio_enc; type = AV_OPT_FLAG_AUDIO_PARAM; } - if (opt_default(arg, arg2, avctx, type|AV_OPT_FLAG_ENCODING_PARAM)) { + if (ffserver_opt_default(arg, arg2, avctx, type|AV_OPT_FLAG_ENCODING_PARAM)) { fprintf(stderr, "AVOption error: %s %s\n", arg, arg2); errors++; }