summaryrefslogtreecommitdiff
path: root/libavresample
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2013-01-16 14:18:38 -0500
committerJustin Ruggles <justin.ruggles@gmail.com>2013-01-17 19:27:01 -0500
commitb90632d5964d3998bab7323468a6b43ab6a24b34 (patch)
tree346e795d7a18312e62aecf0b87bfccb5a28faece /libavresample
parentf07ef2d9c9e9d1e84c532e9102594834e88a5c83 (diff)
downloadffmpeg-b90632d5964d3998bab7323468a6b43ab6a24b34.tar.gz
lavr: always reset mix function names and pointers in mix_function_init()
CC: libav-stable@libav.org
Diffstat (limited to 'libavresample')
-rw-r--r--libavresample/audio_mix.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/libavresample/audio_mix.c b/libavresample/audio_mix.c
index 7ed32d80df..c701bf154b 100644
--- a/libavresample/audio_mix.c
+++ b/libavresample/audio_mix.c
@@ -284,11 +284,12 @@ static void mix_2_to_6_fltp_flt_c(float **samples, float **matrix, int len,
static int mix_function_init(AudioMix *am)
{
+ am->func_descr = am->func_descr_generic = "n/a";
+ am->mix = am->mix_generic = NULL;
+
/* no need to set a mix function when we're skipping mixing */
- if (!am->in_matrix_channels || !am->out_matrix_channels) {
- am->func_descr = "n/a";
+ if (!am->in_matrix_channels || !am->out_matrix_channels)
return 0;
- }
/* any-to-any C versions */