avfiltergraph: use aresample not aconvert in the alternative merge code.
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 17 May 2012 11:11:13 +0000 (13:11 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 17 May 2012 11:11:13 +0000 (13:11 +0200)
commit3ae64dc48ff781717cb3b19c51740b128b8bb732
tree3c22ee02206207823d13b186e516acdf7736a739
parente3c6b612635b32d2de4ffac1c198fb5a76dd95d3
avfiltergraph: use aresample not aconvert in the alternative merge code.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/avfiltergraph.c