diff options
author | Nicolas George <nicolas.george@normalesup.org> | 2012-02-21 00:45:18 +0400 |
---|---|---|
committer | Nicolas George <nicolas.george@normalesup.org> | 2012-02-21 02:36:03 +0400 |
commit | a923b6b8f4f90d09c7c39cc8bfab7ee9d30a2843 (patch) | |
tree | 342413a9b61bff651d1aae5d6b1b53b8db534943 /libavfilter/af_pan.c | |
parent | eb9ba527e71fe11f425ecfaf935955a5accc716a (diff) |
af_pan: move query_format before config_props.
That is the logical order in which the functions are called,
and there is no longer any need of forward declarations.
Diffstat (limited to 'libavfilter/af_pan.c')
-rw-r--r-- | libavfilter/af_pan.c | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/libavfilter/af_pan.c b/libavfilter/af_pan.c index a9609df630..4119d59dc8 100644 --- a/libavfilter/af_pan.c +++ b/libavfilter/af_pan.c @@ -210,6 +210,29 @@ static int are_gains_pure(const PanContext *pan) return 1; } +static int query_formats(AVFilterContext *ctx) +{ + PanContext *pan = ctx->priv; + AVFilterLink *inlink = ctx->inputs[0]; + AVFilterLink *outlink = ctx->outputs[0]; + AVFilterFormats *formats; + + pan->pure_gains = are_gains_pure(pan); + /* libswr supports any sample and packing formats */ + avfilter_set_common_sample_formats(ctx, avfilter_make_all_formats(AVMEDIA_TYPE_AUDIO)); + avfilter_set_common_packing_formats(ctx, avfilter_make_all_packing_formats()); + + // inlink supports any channel layout + formats = avfilter_make_all_channel_layouts(); + avfilter_formats_ref(formats, &inlink->out_chlayouts); + + // outlink supports only requested output channel layout + formats = NULL; + avfilter_add_format(&formats, pan->out_channel_layout); + avfilter_formats_ref(formats, &outlink->in_chlayouts); + return 0; +} + static int config_props(AVFilterLink *link) { AVFilterContext *ctx = link->dst; @@ -343,29 +366,6 @@ static void filter_samples(AVFilterLink *inlink, AVFilterBufferRef *insamples) avfilter_unref_buffer(insamples); } -static int query_formats(AVFilterContext *ctx) -{ - PanContext *pan = ctx->priv; - AVFilterLink *inlink = ctx->inputs[0]; - AVFilterLink *outlink = ctx->outputs[0]; - AVFilterFormats *formats; - - pan->pure_gains = are_gains_pure(pan); - /* libswr supports any sample and packing formats */ - avfilter_set_common_sample_formats(ctx, avfilter_make_all_formats(AVMEDIA_TYPE_AUDIO)); - avfilter_set_common_packing_formats(ctx, avfilter_make_all_packing_formats()); - - // inlink supports any channel layout - formats = avfilter_make_all_channel_layouts(); - avfilter_formats_ref(formats, &inlink->out_chlayouts); - - // outlink supports only requested output channel layout - formats = NULL; - avfilter_add_format(&formats, pan->out_channel_layout); - avfilter_formats_ref(formats, &outlink->in_chlayouts); - return 0; -} - static av_cold void uninit(AVFilterContext *ctx) { PanContext *pan = ctx->priv; |