Commit 3ae64dc4 authored by Michael Niedermayer's avatar Michael Niedermayer

avfiltergraph: use aresample not aconvert in the alternative merge code.

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent e3c6b612
...@@ -263,7 +263,7 @@ static int query_formats(AVFilterGraph *graph, AVClass *log_ctx) ...@@ -263,7 +263,7 @@ static int query_formats(AVFilterGraph *graph, AVClass *log_ctx)
samplerates = ff_merge_samplerates (link->in_samplerates, link->out_samplerates); samplerates = ff_merge_samplerates (link->in_samplerates, link->out_samplerates);
if (!formats || !chlayouts || !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; return ret;
#else #else
int convert_needed = 0; int convert_needed = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment