Merge commit 'fc6a3ef40d34ce8443ae57c2452f3f273d7d4891'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 4 Jan 2014 01:16:30 +0000 (02:16 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 4 Jan 2014 01:16:33 +0000 (02:16 +0100)
* commit 'fc6a3ef40d34ce8443ae57c2452f3f273d7d4891':
  audio_mix: fix zeroing output channels in certain cases

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavresample/audio_mix.c

Simple merge