[FFmpeg-cvslog] Merge commit 'fc6a3ef40d34ce8443ae57c2452f3f273d7d4891'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jan  4 02:16:30 2014 +0100| [4b8bc6d2b0a94c850f7d807a7da21804f1f9c1c7] | committer: Michael Niedermayer

Merge commit 'fc6a3ef40d34ce8443ae57c2452f3f273d7d4891'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4b8bc6d2b0a94c850f7d807a7da21804f1f9c1c7
---