Merge commit 'a8ea936a0a00570f61a16a588821b52f6a3115c2'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Feb 2013 11:05:00 +0000 (12:05 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Feb 2013 11:05:00 +0000 (12:05 +0100)
commit5459cf411412c7a1d2da7ce6a6955c7d57490a55
tree18117251ae2ca34fd6895998f9699ef09855427a
parentd88e674a15dc23ca6bb68173dbb7c12e5d668bb5
parenta8ea936a0a00570f61a16a588821b52f6a3115c2
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@gmx.at>
libavcodec/dpcm.c
libavcodec/gsmdec.c
libavcodec/gsmdec_data.h
libavcodec/imc.c
libavcodec/libilbc.c