RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-03-03 11:07:41 +00:00
Code Issues Projects Releases Wiki Activity

lavr: call mix_function_init() in ff_audio_mix_set_matrix()

Browse Source 
This is needed if a custom matrix is set by the user after opening the
AVAudioResampleContext because the matrix channel count can change if
different mixing coefficients are used.

CC:libav-stable@libav.org
(cherry picked from commit f07ef2d9c9)

Conflicts:

	libavresample/audio_mix.c
This commit is contained in:
Justin Ruggles 2013-01-16 14:15:57 -05:00 committed by Reinhard Tartler
parent a856623e87
commit d7e7e12abc
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavresample/audio_mix.c
View File

@ -401,10 +401,6 @@ AudioMix *ff_audio_mix_alloc(AVAudioResampleContext *avr)
av_free(matrix_dbl);
}
ret = mix_function_init(am);
if (ret < 0)
goto error;
return am;
error:
@ -544,8 +540,5 @@ int ff_audio_mix_set_matrix(AudioMix *am, const double *matrix, int stride)
return AVERROR(EINVAL);
}
/* TODO: detect situations where we can just swap around pointers
instead of doing matrix multiplications with 0.0 and 1.0 */
return 0;
return mix_function_init(am);
}