diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2013-02-24 21:32:30 -0500 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2013-02-25 15:15:21 -0500 |
| commit | e8da807537e314d74cb6d93598f1dcfb891fa655 (patch) | |
| tree | 64d4606c6fc2d61f49e2bdd98ec9ec71dc6b0878 | |
| parent | 699d02b839ff8001bb68d975a15e9622cd64574b (diff) | |
| download | ffmpeg-e8da807537e314d74cb6d93598f1dcfb891fa655.tar.gz | |
cmdutils: only use libavresample when it is enabled
avprobe and avserver use cmdutils and do not strictly require libavresample.
| -rw-r--r-- | cmdutils.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/cmdutils.c b/cmdutils.c index ee6baa1306..688f501840 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -406,7 +406,9 @@ int opt_default(void *optctx, const char *opt, const char *arg) char opt_stripped[128]; const char *p; const AVClass *cc = avcodec_get_class(), *fc = avformat_get_class(); +#if CONFIG_AVRESAMPLE const AVClass *rc = avresample_get_class(); +#endif #if CONFIG_SWSCALE const AVClass *sc = sws_get_class(); #endif @@ -423,9 +425,11 @@ int opt_default(void *optctx, const char *opt, const char *arg) else if ((o = av_opt_find(&fc, opt, NULL, 0, AV_OPT_SEARCH_CHILDREN | AV_OPT_SEARCH_FAKE_OBJ))) av_dict_set(&format_opts, opt, arg, FLAGS); +#if CONFIG_AVRESAMPLE else if ((o = av_opt_find(&rc, opt, NULL, 0, AV_OPT_SEARCH_CHILDREN | AV_OPT_SEARCH_FAKE_OBJ))) av_dict_set(&resample_opts, opt, arg, FLAGS); +#endif #if CONFIG_SWSCALE else if ((o = av_opt_find(&sc, opt, NULL, 0, AV_OPT_SEARCH_CHILDREN | AV_OPT_SEARCH_FAKE_OBJ))) { |