[FFmpeg-cvslog] Merge commit 'ee6ca11b657515ad736ec0d2b8635e098d0a2680'

Michael Niedermayer git at videolan.org
Wed Feb 13 12:47:56 CET 2013


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

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 at gmx.at>

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





More information about the ffmpeg-cvslog mailing list