generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmdutils: Conditionally compile libswscale-related bits

Browse Source 
This fixes compilation with libswscale disabled.

(cherry picked from commit ab79966475)
Signed-off-by: Diego Biurrun <diego@biurrun.de>
This commit is contained in:
Diego Biurrun
2012-10-29 18:00:14 +01:00
parent 277103e07f
commit 28f2d3c5a5
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cmdutils.c
View File

@@ -369,7 +369,10 @@ int opt_default(const char *opt, const char *arg)
const AVOption *o; const AVOption *o;
char opt_stripped[128]; char opt_stripped[128];
const char *p; const char *p;
const AVClass *cc = avcodec_get_class(), *fc = avformat_get_class(), *sc = sws_get_class(); const AVClass *cc = avcodec_get_class(), *fc = avformat_get_class();
#if CONFIG_SWSCALE
const AVClass *sc = sws_get_class();
#endif
if (!(p = strchr(opt, ':'))) if (!(p = strchr(opt, ':')))
p = opt + strlen(opt); p = opt + strlen(opt);
@@ -383,6 +386,7 @@ int opt_default(const char *opt, const char *arg)
else if ((o = av_opt_find(&fc, opt, NULL, 0, else if ((o = av_opt_find(&fc, opt, NULL, 0,
AV_OPT_SEARCH_CHILDREN | AV_OPT_SEARCH_FAKE_OBJ))) AV_OPT_SEARCH_CHILDREN | AV_OPT_SEARCH_FAKE_OBJ)))
av_dict_set(&format_opts, opt, arg, FLAGS); av_dict_set(&format_opts, opt, arg, FLAGS);
#if CONFIG_SWSCALE
else if ((o = av_opt_find(&sc, opt, NULL, 0, else if ((o = av_opt_find(&sc, opt, NULL, 0,
AV_OPT_SEARCH_CHILDREN | AV_OPT_SEARCH_FAKE_OBJ))) { AV_OPT_SEARCH_CHILDREN | AV_OPT_SEARCH_FAKE_OBJ))) {
// XXX we only support sws_flags, not arbitrary sws options // XXX we only support sws_flags, not arbitrary sws options
@@ -392,6 +396,7 @@ int opt_default(const char *opt, const char *arg)
return ret; return ret;
} }
} }
#endif
if (o) if (o)
return 0; return 0;