RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-05-17 13:11:13 +02:00
parent e3c6b61263
commit 3ae64dc48f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavfilter/avfiltergraph.c
View File

@ -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;