From 3ae64dc48ff781717cb3b19c51740b128b8bb732 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 17 May 2012 13:11:13 +0200 Subject: [PATCH] avfiltergraph: use aresample not aconvert in the alternative merge code. Signed-off-by: Michael Niedermayer --- libavfilter/avfiltergraph.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index 2286781047..9743009eb5 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -263,7 +263,7 @@ static int query_formats(AVFilterGraph *graph, AVClass *log_ctx) samplerates = ff_merge_samplerates (link->in_samplerates, link->out_samplerates); if (!formats || !chlayouts || !samplerates) - if (ret = insert_conv_filter(graph, link, "aconvert", NULL)) + if (ret = insert_conv_filter(graph, link, "aresample", NULL)) return ret; #else int convert_needed = 0;