virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-06-19 19:03:00 +02:00
Code Issues Releases Activity

lavr: fix handling of custom mix matrices

Browse Source 
Adds some validation for changing parameters after setting the matrix and
fixes a bug in the conversion path setup.
This commit is contained in:
Justin Ruggles
2012-08-04 10:28:22 -04:00
parent 73486e3b61
commit 8821ae649e
3 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libavresample/audio_mix.c
+9 -1
View File
@@ -314,7 +314,15 @@ int ff_audio_mix_init(AVAudioResampleContext *avr)
}
/* build matrix if the user did not already set one */
if (!avr->am->matrix) {
if (avr->am->matrix) {
if (avr->am->coeff_type != avr->mix_coeff_type ||
avr->am->in_layout != avr->in_channel_layout ||
avr->am->out_layout != avr->out_channel_layout) {
av_log(avr, AV_LOG_ERROR,
"Custom matrix does not match current parameters\n");
return AVERROR(EINVAL);
}
} else {
int i, j;
char in_layout_name[128];
char out_layout_name[128];