[FFmpeg-cvslog] Merge commit 'c7921a480467876ece06566e0efd8f6bce9d1903'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Dec 11 01:44:04 2014 +0100| [66daf3b81154078852a049b44fc477d5195cd0f5] | committer: Michael Niedermayer

Merge commit 'c7921a480467876ece06566e0efd8f6bce9d1903'

* commit 'c7921a480467876ece06566e0efd8f6bce9d1903':
  libfdk-aacdec: Fix a boundary check

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

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