Merge commit '1647da89dd8ac09a55c111589f7a30d7e6b87d90'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Feb 2013 11:54:03 +0000 (12:54 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Feb 2013 11:54:08 +0000 (12:54 +0100)
commit91043de8256fa87a0a20cc3a139f668110257dbe
treec08d67dfa52db597b9b87bd74b304e6c03b8ade9
parent0dff771f31cffffec0e16944d3890564c2da16eb
parent1647da89dd8ac09a55c111589f7a30d7e6b87d90
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@gmx.at>
libavcodec/wmavoice.c
libavcodec/ws-snd1.c