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:
56ef1ef
)
lavr: call mix_function_init() in ff_audio_mix_set_matrix()
author
Justin Ruggles
<justin.ruggles@gmail.com>
Wed, 16 Jan 2013 19:15:57 +0000
(14:15 -0500)
committer
Justin Ruggles
<justin.ruggles@gmail.com>
Fri, 18 Jan 2013 00:27:01 +0000
(19:27 -0500)
This is needed if a custom matrix is set by the user after opening the
AVAudioResampleContext because the matrix channel count can change if
different mixing coefficients are used.
CC:libav-stable@libav.org
libavresample/audio_mix.c
patch
|
blob
|
history
diff --git
a/libavresample/audio_mix.c
b/libavresample/audio_mix.c
index
12f5d24
..
7ed32d8
100644
(file)
--- a/
libavresample/audio_mix.c
+++ b/
libavresample/audio_mix.c
@@
-422,10
+422,6
@@
AudioMix *ff_audio_mix_alloc(AVAudioResampleContext *avr)
av_free(matrix_dbl);
}
- ret = mix_function_init(am);
- if (ret < 0)
- goto error;
-
return am;
error:
@@
-704,5
+700,5
@@
int ff_audio_mix_set_matrix(AudioMix *am, const double *matrix, int stride)
return AVERROR(EINVAL);
}
- return
0
;
+ return
mix_function_init(am)
;
}