[FFmpeg-cvslog] Merge commit 'd615187f74ddf3413778a8b5b7ae17255b0df88e'

Michael Niedermayer git at videolan.org
Wed Feb 4 14:03:54 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Feb  4 13:49:17 2015 +0100| [ba4fba8f487380a0152b73ba6f9f5e5556322ae7] | committer: Michael Niedermayer

Merge commit 'd615187f74ddf3413778a8b5b7ae17255b0df88e'

* commit 'd615187f74ddf3413778a8b5b7ae17255b0df88e':
  aacdec: Support for ER AAC ELD 480.

Conflicts:
	libavcodec/aacdec.c

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

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





More information about the ffmpeg-cvslog mailing list