[FFmpeg-cvslog] avfiltergraph: use aresample not aconvert in the alternative merge code.

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May 17 13:11:13 2012 +0200| [3ae64dc48ff781717cb3b19c51740b128b8bb732] | committer: Michael Niedermayer

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

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3ae64dc48ff781717cb3b19c51740b128b8bb732
---

 libavfilter/avfiltergraph.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c
index 2286781..9743009 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;