Rename opt_default() so it will not conflict with the one from ffmpeg.c

[ffmpeg] / ffserver.c

diff --git a/ffserver.c b/ffserver.c
index c91bd640991d29fb71897ce186b51c9623d5f5c3..5e18970ca7b851922b7b4966f9c8d982fe96e9a8 100644 (file)
--- 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++;
             }