OSDN Git Service

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)
commit4b8bc6d2b0a94c850f7d807a7da21804f1f9c1c7
treeb1bb3f853c1bb5fdcdc901a47d1be37a78135c03
parentfadec4f6dbc77b74e5b868ef206ecc560da639fb
parentfc6a3ef40d34ce8443ae57c2452f3f273d7d4891
Merge commit 'fc6a3ef40d34ce8443ae57c2452f3f273d7d4891'

* commit 'fc6a3ef40d34ce8443ae57c2452f3f273d7d4891':
  audio_mix: fix zeroing output channels in certain cases

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