Merge commit 'cc976a75dffa148d655b52604331679ff669e8a2'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 4 Jan 2014 01:29:38 +0000 (02:29 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 4 Jan 2014 01:30:07 +0000 (02:30 +0100)
commit781fd58838caec4a881582f4ba36f32eb1594000
tree3b8c49a8d0f053b070526df3d7d2218e90ec7925
parent4b8bc6d2b0a94c850f7d807a7da21804f1f9c1c7
parentcc976a75dffa148d655b52604331679ff669e8a2
Merge commit 'cc976a75dffa148d655b52604331679ff669e8a2'

* commit 'cc976a75dffa148d655b52604331679ff669e8a2':
  audio_mix: print (SKIP) instead of 0.0 for matrix columns removed along with output zeroing

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