[FFmpeg-cvslog] Merge commit '3d3cf6745e2a5dc9c377244454c3186d75b177fa'

Michael Niedermayer git at videolan.org
Mon Nov 26 16:02:19 CET 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Nov 26 15:15:02 2012 +0100| [59b68ee8870ad7b831321ff39638660ac59e4a18] | committer: Michael Niedermayer

Merge commit '3d3cf6745e2a5dc9c377244454c3186d75b177fa'

* commit '3d3cf6745e2a5dc9c377244454c3186d75b177fa':
  aacdec: use float planar sample format for output

Conflicts:
	libavcodec/aacdec.c
	libavcodec/aacsbr.c

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

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





More information about the ffmpeg-cvslog mailing list