[FFmpeg-cvslog] Merge commit '205a95f7b5178362874bc1e65eae9866723491c1'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Feb 13 12:49:48 2013 +0100| [0dff771f31cffffec0e16944d3890564c2da16eb] | committer: Michael Niedermayer

Merge commit '205a95f7b5178362874bc1e65eae9866723491c1'

* commit '205a95f7b5178362874bc1e65eae9866723491c1':
  wmaenc: alloc/free coded_frame instead of keeping it in the WMACodecContext
  wma: decode directly to the user-provided AVFrame
  wmapro: decode directly to the user-provided AVFrame
  wavpack: decode directly to the user-provided AVFrame

Conflicts:
	libavcodec/wavpack.c

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

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