lavr: always reset mix function names and pointers in mix_function_init()
authorJustin Ruggles <justin.ruggles@gmail.com>
Wed, 16 Jan 2013 19:18:38 +0000 (14:18 -0500)
committerJustin Ruggles <justin.ruggles@gmail.com>
Fri, 18 Jan 2013 00:27:01 +0000 (19:27 -0500)
CC: libav-stable@libav.org
libavresample/audio_mix.c

index 7ed32d8..c701bf1 100644 (file)
@@ -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 */