[FFmpeg-cvslog] Merge commit '86bfcfcf2364bc837b7bb582c66a8a15a332414f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Feb 13 12:14:46 2013 +0100| [afe30fe0600824b0dcda8318f09a5a4e376b99c3] | committer: Michael Niedermayer

Merge commit '86bfcfcf2364bc837b7bb582c66a8a15a332414f'

* commit '86bfcfcf2364bc837b7bb582c66a8a15a332414f':
  mace: decode directly to the user-provided AVFrame
  libspeex: decode directly to the user-provided AVFrame
  libopus: decode directly to the user-provided AVFrame
  libopencore-amr: decode directly to the user-provided AVFrame
  libgsm: decode directly to the user-provided AVFrame

Conflicts:
	libavcodec/libopusdec.c
	libavcodec/mace.c

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

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