opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-26 01:49:43 +08:00
Code Issues Packages Projects Releases Wiki 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-07-29 19:22:19 -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

5
libavresample/utils.c
View File

@ -48,9 +48,8 @@ int avresample_open(AVAudioResampleContext *avr)
avr->resample_channels = FFMIN(avr->in_channels, avr->out_channels);
avr->downmix_needed = avr->in_channels > avr->out_channels;
avr->upmix_needed = avr->out_channels > avr->in_channels ||
avr->am->matrix ||
(avr->out_channels == avr->in_channels &&
avr->in_channel_layout != avr->out_channel_layout);
(!avr->downmix_needed && (avr->am->matrix ||
avr->in_channel_layout != avr->out_channel_layout));
avr->mixing_needed = avr->downmix_needed || avr->upmix_needed;
/* set resampling parameters */