• Michael Niedermayer's avatar
    Merge commit 'ee6ca11b' · dca6fb08
    Michael Niedermayer authored
    * commit 'ee6ca11b':
      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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    dca6fb08
truespeech.c 10.7 KB