Merge commit '86bfcfcf2364bc837b7bb582c66a8a15a332414f'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Feb 2013 11:14:46 +0000 (12:14 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Feb 2013 11:14:46 +0000 (12:14 +0100)
commitafe30fe0600824b0dcda8318f09a5a4e376b99c3
tree06921b98421767cea958eed3943b10fb71e4997d
parent5459cf411412c7a1d2da7ce6a6955c7d57490a55
parent86bfcfcf2364bc837b7bb582c66a8a15a332414f
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@gmx.at>
libavcodec/libgsm.c
libavcodec/libopencore-amr.c
libavcodec/libopusdec.c
libavcodec/libspeexdec.c
libavcodec/mace.c