[FFmpeg-cvslog] Merge commit '95d52464542f532061290192518d5fe1c1930e8d'

Michael Niedermayer git at videolan.org
Mon Jun 24 11:11:35 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun 24 10:57:04 2013 +0200| [af5f9c08763baff271401cf7f7478bae4d5db8dc] | committer: Michael Niedermayer

Merge commit '95d52464542f532061290192518d5fe1c1930e8d'

* commit '95d52464542f532061290192518d5fe1c1930e8d':
  lavc: Add option to encode MPEG-2 AAC with libfdk-aac

Conflicts:
	doc/APIchanges
	libavcodec/version.h

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

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





More information about the ffmpeg-cvslog mailing list