diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2008-09-28 19:33:19 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2008-09-28 19:33:19 +0000 |
| commit | df1a4b11342050086bc9724c636f19971cec825c (patch) | |
| tree | cda7edf126979dc150b5ed6ec012f26e03a1c5f1 /ffserver.c | |
| parent | 30ab4deda8d62280a93a658a3d97b7a59670e66f (diff) | |
| download | ffmpeg-df1a4b11342050086bc9724c636f19971cec825c.tar.gz | |
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
Diffstat (limited to 'ffserver.c')
| -rw-r--r-- | ffserver.c | 4 |
1 files 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++; } |