diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-26 12:50:34 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-26 12:50:34 +0100 |
| commit | 6fbddc80d63ddbc8974f4b2e286de20def6c201d (patch) | |
| tree | 327dd7a19fba89a54ba3333fba3545e7598d3e96 /cmdutils.c | |
| parent | 13fa074173269308f5051bb1a683c9ed54ab8735 (diff) | |
| parent | e8da807537e314d74cb6d93598f1dcfb891fa655 (diff) | |
| download | ffmpeg-6fbddc80d63ddbc8974f4b2e286de20def6c201d.tar.gz | |
Merge commit 'e8da807537e314d74cb6d93598f1dcfb891fa655'
* commit 'e8da807537e314d74cb6d93598f1dcfb891fa655':
cmdutils: only use libavresample when it is enabled
libschroedinger: cosmetics: rename variable avccontext to avctx
vorbisenc: cosmetics: rename variable avccontext to avctx
Conflicts:
cmdutils.c
libavcodec/libschroedinger.c
libavcodec/libschroedingerenc.c
libavcodec/vorbisenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'cmdutils.c')
| -rw-r--r-- | cmdutils.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cmdutils.c b/cmdutils.c index 1634947b20..36a80c6740 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -474,7 +474,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(); - const av_unused AVClass *rc_class; +#if CONFIG_AVRESAMPLE + const AVClass *rc = avresample_get_class(); +#endif const AVClass *sc, *swr_class; if (!strcmp(opt, "debug") || !strcmp(opt, "fdebug")) @@ -527,8 +529,7 @@ int opt_default(void *optctx, const char *opt, const char *arg) } #endif #if CONFIG_AVRESAMPLE - rc_class = avresample_get_class(); - if ((o=av_opt_find(&rc_class, opt, NULL, 0, + 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); consumed = 1; |