[FFmpeg-cvslog] Merge commit 'e57daa876bf0cf50782550e366e589441cd8c2bd'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Feb 13 11:18:55 2013 +0100| [4789955ec4260f9e8f99b8d774ada2ad679d5630] | committer: Michael Niedermayer

Merge commit 'e57daa876bf0cf50782550e366e589441cd8c2bd'

* commit 'e57daa876bf0cf50782550e366e589441cd8c2bd':
  adpcm: decode directly to the user-provided AVFrame
  ac3: decode directly to the user-provided AVFrame
  aac: decode directly to the user-provided AVFrame
  8svx: decode directly to the user-provided AVFrame

Conflicts:
	libavcodec/8svx.c
	libavcodec/ac3dec.c
	libavcodec/adpcm.c

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

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