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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
pull/30/merge
Michael Niedermayer 13 years ago
parent e3c6b61263
commit 3ae64dc48f
  1. 2
      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;

Loading…
Cancel
Save