Merge commit 'ee6ca11b657515ad736ec0d2b8635e098d0a2680'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Feb 2013 11:42:14 +0000 (12:42 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Feb 2013 11:42:14 +0000 (12:42 +0100)
commitdca6fb08a71b8201f0a32f9cff18e7753355733a
tree010719ea90db7d04612fcdd871870119ecb04cfb
parent2becf21d9fd841962f87ad4e273274ee81a35bad
parentee6ca11b657515ad736ec0d2b8635e098d0a2680
Merge commit 'ee6ca11b657515ad736ec0d2b8635e098d0a2680'

* commit 'ee6ca11b657515ad736ec0d2b8635e098d0a2680':
  vorbis: decode directly to the user-provided AVFrame
  vmdaudio: decode directly to the user-provided AVFrame
  twinvq: decode directly to the user-provided AVFrame
  tta: decode directly to the user-provided AVFrame
  truespeech: decode directly to the user-provided AVFrame

Conflicts:
libavcodec/tta.c
libavcodec/twinvq.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/truespeech.c
libavcodec/tta.c
libavcodec/twinvq.c
libavcodec/vmdav.c
libavcodec/vorbisdec.c