[FFmpeg-cvslog] Merge commit '0ee2573347ecdb9cb5656001f7201d819eec16d8'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Feb  4 13:31:24 2015 +0100| [f53aa3f4f331d845b76c336405435b76dc7204f9] | committer: Michael Niedermayer

Merge commit '0ee2573347ecdb9cb5656001f7201d819eec16d8'

* commit '0ee2573347ecdb9cb5656001f7201d819eec16d8':
  aacdec: Support for ER AAC in LATM

Conflicts:
	libavcodec/aacdec.c

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

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