virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

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

Browse Source 
when it is moved to cmdutils.c/h.

Originally committed as revision 15449 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2008-09-28 19:33:19 +00:00
parent 30ab4deda8
commit df1a4b1134
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ffserver.c
View File

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