[FFmpeg-cvslog] Merge commit 'cb7b47a61dba0b9329ecede5dd3211dc0662dc05'

Michael Niedermayer git at videolan.org
Wed Feb 13 12:03:52 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Feb 13 11:59:51 2013 +0100| [d88e674a15dc23ca6bb68173dbb7c12e5d668bb5] | committer: Michael Niedermayer

Merge commit 'cb7b47a61dba0b9329ecede5dd3211dc0662dc05'

* commit 'cb7b47a61dba0b9329ecede5dd3211dc0662dc05':
  g726: decode directly to the user-provided AVFrame
  g723.1: decode directly to the user-provided AVFrame
  g722: decode directly to the user-provided AVFrame
  flac: decode directly to the user-provided AVFrame
  cinaudio: decode directly to the user-provided AVFrame

Conflicts:
	libavcodec/g723_1.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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





More information about the ffmpeg-cvslog mailing list