[FFmpeg-cvslog] Merge commit 'fbc20c3b85be169389b6c9f8806a311d3dea91ea' into release/2.4

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sun Jan 18 02:12:58 2015 +0100| [4f72aef342c8db1619bd55c8592f9f3fa28957fe] | committer: Michael Niedermayer

Merge commit 'fbc20c3b85be169389b6c9f8806a311d3dea91ea' into release/2.4

* commit 'fbc20c3b85be169389b6c9f8806a311d3dea91ea':
  aacdec: avoid an out-of-bounds write

Conflicts:
	libavcodec/aacdec.c

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

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