[FFmpeg-cvslog] r15449 - trunk/ffserver.c

[michael]

Author: michael
Date: Sun Sep 28 21:33:19 2008
New Revision: 15449

Log:
Rename opt_default() so it will not conflict with the one from ffmpeg.c
when it is moved to cmdutils.c/h.


Modified:
   trunk/ffserver.c

Modified: trunk/ffserver.c
==============================================================================
--- trunk/ffserver.c	(original)
+++ trunk/ffserver.c	Sun Sep 28 21:33:19 2008
@@ -3732,7 +3732,7 @@ static void load_module(const char *file
 }
 #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 *fi
                 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++;
             }