[FFmpeg-cvslog] Merge commit 'a8ea936a0a00570f61a16a588821b52f6a3115c2'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Feb 13 12:05:00 2013 +0100| [5459cf411412c7a1d2da7ce6a6955c7d57490a55] | committer: Michael Niedermayer

Merge commit 'a8ea936a0a00570f61a16a588821b52f6a3115c2'

* commit 'a8ea936a0a00570f61a16a588821b52f6a3115c2':
  libilbc: decode directly to the user-provided AVFrame
  dpcm: decode directly to the user-provided AVFrame
  imc/iac: decode directly to the user-provided AVFrame
  gsm: decode directly to the user-provided AVFrame

Conflicts:
	libavcodec/dpcm.c

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

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