OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1f3f7bd
)
lavfi: fix resample with differing formats
author
Michael Niedermayer
<michaelni@gmx.at>
Wed, 16 May 2012 01:53:29 +0000
(
03:53
+0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Wed, 16 May 2012 01:53:29 +0000
(
03:53
+0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/af_aresample.c
patch
|
blob
|
history
diff --git
a/libavfilter/af_aresample.c
b/libavfilter/af_aresample.c
index
521ccf7
..
abc8235
100644
(file)
--- a/
libavfilter/af_aresample.c
+++ b/
libavfilter/af_aresample.c
@@
-107,7
+107,7
@@
static int config_output(AVFilterLink *outlink)
//TODO: make the resampling parameters (filter size, phrase shift, linear, cutoff) configurable
aresample->swr = swr_alloc_set_opts(aresample->swr,
-
inlink->channel_layout, inlink->format, aresample->out
_rate,
+
outlink->channel_layout, outlink->format, outlink->sample
_rate,
inlink->channel_layout, inlink->format, inlink->sample_rate,
0, ctx);
if (!aresample->swr)