[FFmpeg-cvslog] lavr: always reset mix function names and pointers in mix_function_init()

[Justin Ruggles]

ffmpeg | branch: master | Justin Ruggles <justin.ruggles at gmail.com> | Wed Jan 16 14:18:38 2013 -0500| [b90632d5964d3998bab7323468a6b43ab6a24b34] | committer: Justin Ruggles

lavr: always reset mix function names and pointers in mix_function_init()

CC: libav-stable at libav.org

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b90632d5964d3998bab7323468a6b43ab6a24b34
---

 libavresample/audio_mix.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/libavresample/audio_mix.c b/libavresample/audio_mix.c
index 7ed32d8..c701bf1 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 */