Showing the changes to libavfilter (1 of 1 file). Show all
Unified · Split
| @@ -53,23 +53,6 @@ static const AVOption drmeter_options[] = { · 52 unmodified lines | |||
| 53 | 53 | ||
| 54 | AVFILTER_DEFINE_CLASS(drmeter); | 54 | AVFILTER_DEFINE_CLASS(drmeter); |
| 55 | 55 | ||
| 56 | static int query_formats(AVFilterContext *ctx) | ||
| 57 | { | ||
| 58 | static const enum AVSampleFormat sample_fmts[] = { | ||
| 59 | AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_FLT, | ||
| 60 | AV_SAMPLE_FMT_NONE | ||
| 61 | }; | ||
| 62 | int ret = ff_set_common_all_channel_counts(ctx); | ||
| 63 | if (ret < 0) | ||
| 64 | return ret; | ||
| 65 | |||
| 66 | ret = ff_set_common_formats_from_list(ctx, sample_fmts); | ||
| 67 | if (ret < 0) | ||
| 68 | return ret; | ||
| 69 | |||
| 70 | return ff_set_common_all_samplerates(ctx); | ||
| 71 | } | ||
| 72 | |||
| 73 | static int config_output(AVFilterLink *outlink) | 56 | static int config_output(AVFilterLink *outlink) |
| 74 | { | 57 | { |
| 75 | DRMeterContext *s = outlink->src->priv; | 58 | DRMeterContext *s = outlink->src->priv; |
| @@ -219,5 +202,5 @@ const AVFilter ff_af_drmeter = { · 143 unmodified lines | |||
| 219 | .uninit = uninit, | 202 | .uninit = uninit, |
| 220 | FILTER_INPUTS(drmeter_inputs), | 203 | FILTER_INPUTS(drmeter_inputs), |
| 221 | FILTER_OUTPUTS(drmeter_outputs), | 204 | FILTER_OUTPUTS(drmeter_outputs), |
| 222 | FILTER_QUERY_FUNC(query_formats), | 205 | FILTER_SAMPLEFMTS(AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_FLT), |
| 223 | }; | 206 | }; |