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

when it is moved to cmdutils.c/h.


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

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++;
             }