summaryrefslogtreecommitdiffstats
path: root/libavfilter/af_amerge.c
diff options
context:
space:
mode:
authorNicolas George <nicolas.george@normalesup.org>2012-05-23 12:58:15 +0200
committerNicolas George <nicolas.george@normalesup.org>2012-05-23 14:56:50 +0200
commite6aee46760d48e3f861f1d8e893d672fa0115ef3 (patch)
tree5af5032c318c8843035ca7f95bec53a5ba68673f /libavfilter/af_amerge.c
parente15f1286e6bef566f44b51f8cdc99c02025de2d8 (diff)
downloadffmpeg-streaming-e6aee46760d48e3f861f1d8e893d672fa0115ef3.zip
ffmpeg-streaming-e6aee46760d48e3f861f1d8e893d672fa0115ef3.tar.gz
af_amerge: set samples rate in query_formats.
Diffstat (limited to 'libavfilter/af_amerge.c')
-rw-r--r--libavfilter/af_amerge.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavfilter/af_amerge.c b/libavfilter/af_amerge.c
index 18b3046..abccfe4 100644
--- a/libavfilter/af_amerge.c
+++ b/libavfilter/af_amerge.c
@@ -106,6 +106,7 @@ static int query_formats(AVFilterContext *ctx)
layouts = NULL;
ff_add_channel_layout(&layouts, outlayout);
ff_channel_layouts_ref(layouts, &ctx->outputs[0]->in_channel_layouts);
+ ff_set_common_samplerates(ctx, ff_all_samplerates());
return 0;
}
OpenPOWER on IntegriCloud