[FFmpeg-cvslog] Merge commit '182821cff43f5f977004d105b86c47ceb20d00d6'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Feb 13 11:53:23 2013 +0100| [0a5138695aa441ab341b2f00d946c239db69edbf] | committer: Michael Niedermayer

Merge commit '182821cff43f5f977004d105b86c47ceb20d00d6'

* commit '182821cff43f5f977004d105b86c47ceb20d00d6':
  dca: decode directly to the user-provided AVFrame
  cook: decode directly to the user-provided AVFrame
  comfortnoise: decode directly to the user-provided AVFrame
  bmvaudio: decode directly to the user-provided AVFrame
  pcm: decode directly to the user-provided AVFrame

Conflicts:
	libavcodec/pcm.c

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

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