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

CC: libav-stable@libav.org
This commit is contained in:
Justin Ruggles 2013-01-16 14:18:38 -05:00
parent f07ef2d9c9
commit b90632d596

View 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 */