[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

Michael Niedermayer git at videolan.org
Wed Oct 23 10:10:59 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Oct 23 10:02:43 2013 +0200| [fdb48225592c593892ffbe799847ff0867253d2a] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  aac: Add support for Enhanced AAC Low Delay (ER AAC ELD).

Conflicts:
	Changelog
	libavcodec/aacdec.c
	libavcodec/version.h

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

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





More information about the ffmpeg-cvslog mailing list