[FFmpeg-cvslog] Merge commit '1647da89dd8ac09a55c111589f7a30d7e6b87d90'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Feb 13 12:54:03 2013 +0100| [91043de8256fa87a0a20cc3a139f668110257dbe] | committer: Michael Niedermayer

Merge commit '1647da89dd8ac09a55c111589f7a30d7e6b87d90'

* commit '1647da89dd8ac09a55c111589f7a30d7e6b87d90':
  lavr: make sure that the mix function is reset even if no mixing will be done
  lavr: print out the mix matrix in ff_audio_mix_set_matrix()
  ws-snd1: decode directly to the user-provided AVFrame
  wmavoice: decode directly to the user-provided AVFrame

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

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