summaryrefslogtreecommitdiff
path: root/libavresample/audio_mix.c
diff options
context:
space:
mode:
Diffstat (limited to 'libavresample/audio_mix.c')
-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 */