diff options
| -rw-r--r-- | libavfilter/af_aresample.c | 17 | ||||
| -rw-r--r-- | libavfilter/x86/vf_spp.c | 4 | ||||
| -rw-r--r-- | libavutil/opt.h | 3 |
3 files changed, 15 insertions, 9 deletions
diff --git a/libavfilter/af_aresample.c b/libavfilter/af_aresample.c index 6cb765df1b..f6fdd08a1a 100644 --- a/libavfilter/af_aresample.c +++ b/libavfilter/af_aresample.c @@ -80,9 +80,8 @@ static av_cold void uninit(AVFilterContext *ctx) static int query_formats(AVFilterContext *ctx) { AResampleContext *aresample = ctx->priv; - int out_rate = av_get_int(aresample->swr, "osr", NULL); - uint64_t out_layout = av_get_int(aresample->swr, "ocl", NULL); - enum AVSampleFormat out_format = av_get_int(aresample->swr, "osf", NULL); + enum AVSampleFormat out_format; + int64_t out_rate, out_layout; AVFilterLink *inlink = ctx->inputs[0]; AVFilterLink *outlink = ctx->outputs[0]; @@ -91,6 +90,9 @@ static int query_formats(AVFilterContext *ctx) AVFilterFormats *in_samplerates, *out_samplerates; AVFilterChannelLayouts *in_layouts, *out_layouts; + av_opt_get_sample_fmt(aresample->swr, "osf", 0, &out_format); + av_opt_get_int(aresample->swr, "osr", 0, &out_rate); + av_opt_get_int(aresample->swr, "ocl", 0, &out_layout); in_formats = ff_all_formats(AVMEDIA_TYPE_AUDIO); if (!in_formats) @@ -144,8 +146,7 @@ static int config_output(AVFilterLink *outlink) AVFilterContext *ctx = outlink->src; AVFilterLink *inlink = ctx->inputs[0]; AResampleContext *aresample = ctx->priv; - int out_rate; - uint64_t out_layout; + int64_t out_rate, out_layout; enum AVSampleFormat out_format; char inchl_buf[128], outchl_buf[128]; @@ -164,9 +165,9 @@ static int config_output(AVFilterLink *outlink) if (ret < 0) return ret; - out_rate = av_get_int(aresample->swr, "osr", NULL); - out_layout = av_get_int(aresample->swr, "ocl", NULL); - out_format = av_get_int(aresample->swr, "osf", NULL); + av_opt_get_int(aresample->swr, "osr", 0, &out_rate); + av_opt_get_int(aresample->swr, "ocl", 0, &out_layout); + av_opt_get_sample_fmt(aresample->swr, "osf", 0, &out_format); outlink->time_base = (AVRational) {1, out_rate}; av_assert0(outlink->sample_rate == out_rate); diff --git a/libavfilter/x86/vf_spp.c b/libavfilter/x86/vf_spp.c index 1cfb9e81f7..45a9eb068c 100644 --- a/libavfilter/x86/vf_spp.c +++ b/libavfilter/x86/vf_spp.c @@ -223,8 +223,10 @@ av_cold void ff_spp_init_x86(SPPContext *s) int cpu_flags = av_get_cpu_flags(); if (cpu_flags & AV_CPU_FLAG_MMX) { + int64_t bps; s->store_slice = store_slice_mmx; - if (av_get_int(s->dct, "bits_per_sample", NULL) <= 8) { + av_opt_get_int(s->dct, "bits_per_sample", 0, &bps); + if (bps <= 8) { switch (s->mode) { case 0: s->requantize = hardthresh_mmx; break; case 1: s->requantize = softthresh_mmx; break; diff --git a/libavutil/opt.h b/libavutil/opt.h index 0bc0d30972..481d096a1b 100644 --- a/libavutil/opt.h +++ b/libavutil/opt.h @@ -413,8 +413,11 @@ attribute_deprecated const AVOption *av_set_double(void *obj, const char *name, attribute_deprecated const AVOption *av_set_q(void *obj, const char *name, AVRational n); attribute_deprecated const AVOption *av_set_int(void *obj, const char *name, int64_t n); +attribute_deprecated double av_get_double(void *obj, const char *name, const AVOption **o_out); +attribute_deprecated AVRational av_get_q(void *obj, const char *name, const AVOption **o_out); +attribute_deprecated int64_t av_get_int(void *obj, const char *name, const AVOption **o_out); attribute_deprecated const char *av_get_string(void *obj, const char *name, const AVOption **o_out, char *buf, int buf_len); attribute_deprecated const AVOption *av_next_option(FF_CONST_AVUTIL55 void *obj, const AVOption *last); |