[FFmpeg-cvslog] Merge commit '5cc0bd2cb47cbb1040f2bb0ded8d72a442c79b20'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Feb 13 11:45:25 2013 +0100| [f03cdbd0454fbdba53a123a8f95186a519fade8d] | committer: Michael Niedermayer

Merge commit '5cc0bd2cb47cbb1040f2bb0ded8d72a442c79b20'

* commit '5cc0bd2cb47cbb1040f2bb0ded8d72a442c79b20':
  binkaudio: decode directly to the user-provided AVFrame
  atrac3: decode directly to the user-provided AVFrame
  atrac1: decode directly to the user-provided AVFrame
  ape: decode directly to the user-provided AVFrame
  amrwb: decode directly to the user-provided AVFrame

Conflicts:
	libavcodec/amrwbdec.c

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

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