diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-17 13:11:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-17 13:11:13 +0200 |
| commit | 3ae64dc48ff781717cb3b19c51740b128b8bb732 (patch) | |
| tree | 3c22ee02206207823d13b186e516acdf7736a739 /libavfilter/avfiltergraph.c | |
| parent | e3c6b612635b32d2de4ffac1c198fb5a76dd95d3 (diff) | |
| download | ffmpeg-3ae64dc48ff781717cb3b19c51740b128b8bb732.tar.gz | |
avfiltergraph: use aresample not aconvert in the alternative merge code.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/avfiltergraph.c')
| -rw-r--r-- | libavfilter/avfiltergraph.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |