virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-10-30 23:18:11 +02:00
Code Issues Releases Activity

options: mark av_get_{int,double,q} as deprecated.

Browse Source 
Convert last users to av_opt_get_*() counterparts.
This commit is contained in:
Ronald S. Bultje
2015-08-16 16:11:13 -04:00
parent b07d2a2509
commit ad45121d56
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
libavfilter/af_aresample.c
View File

@@ -80,9 +80,8 @@ static av_cold void uninit(AVFilterContext *ctx)
static int query_formats(AVFilterContext *ctx) static int query_formats(AVFilterContext *ctx)
{ {
AResampleContext *aresample = ctx->priv; AResampleContext *aresample = ctx->priv;
int out_rate = av_get_int(aresample->swr, "osr", NULL); enum AVSampleFormat out_format;
uint64_t out_layout = av_get_int(aresample->swr, "ocl", NULL); int64_t out_rate, out_layout;
enum AVSampleFormat out_format = av_get_int(aresample->swr, "osf", NULL);
AVFilterLink *inlink = ctx->inputs[0]; AVFilterLink *inlink = ctx->inputs[0];
AVFilterLink *outlink = ctx->outputs[0]; AVFilterLink *outlink = ctx->outputs[0];
@@ -91,6 +90,9 @@ static int query_formats(AVFilterContext *ctx)
AVFilterFormats *in_samplerates, *out_samplerates; AVFilterFormats *in_samplerates, *out_samplerates;
AVFilterChannelLayouts *in_layouts, *out_layouts; 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); in_formats = ff_all_formats(AVMEDIA_TYPE_AUDIO);
if (!in_formats) if (!in_formats)
@@ -144,8 +146,7 @@ static int config_output(AVFilterLink *outlink)
AVFilterContext *ctx = outlink->src; AVFilterContext *ctx = outlink->src;
AVFilterLink *inlink = ctx->inputs[0]; AVFilterLink *inlink = ctx->inputs[0];
AResampleContext *aresample = ctx->priv; AResampleContext *aresample = ctx->priv;
int out_rate; int64_t out_rate, out_layout;
uint64_t out_layout;
enum AVSampleFormat out_format; enum AVSampleFormat out_format;
char inchl_buf[128], outchl_buf[128]; char inchl_buf[128], outchl_buf[128];
@@ -164,9 +165,9 @@ static int config_output(AVFilterLink *outlink)
if (ret < 0) if (ret < 0)
return ret; return ret;
out_rate = av_get_int(aresample->swr, "osr", NULL); av_opt_get_int(aresample->swr, "osr", 0, &out_rate);
out_layout = av_get_int(aresample->swr, "ocl", NULL); av_opt_get_int(aresample->swr, "ocl", 0, &out_layout);
out_format = av_get_int(aresample->swr, "osf", NULL); av_opt_get_sample_fmt(aresample->swr, "osf", 0, &out_format);
outlink->time_base = (AVRational) {1, out_rate}; outlink->time_base = (AVRational) {1, out_rate};
av_assert0(outlink->sample_rate == out_rate); av_assert0(outlink->sample_rate == out_rate);

4
libavfilter/x86/vf_spp.c
View File

@@ -223,8 +223,10 @@ av_cold void ff_spp_init_x86(SPPContext *s)
int cpu_flags = av_get_cpu_flags(); int cpu_flags = av_get_cpu_flags();
if (cpu_flags & AV_CPU_FLAG_MMX) { if (cpu_flags & AV_CPU_FLAG_MMX) {
int64_t bps;
s->store_slice = store_slice_mmx; 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) { switch (s->mode) {
case 0: s->requantize = hardthresh_mmx; break; case 0: s->requantize = hardthresh_mmx; break;
case 1: s->requantize = softthresh_mmx; break; case 1: s->requantize = softthresh_mmx; break;

3
libavutil/opt.h
View File

@@ -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_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 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); 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); 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); 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 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); attribute_deprecated const AVOption *av_next_option(FF_CONST_AVUTIL55 void *obj, const AVOption *last);