Merge commit 'c7921a480467876ece06566e0efd8f6bce9d1903'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Dec 2014 00:44:04 +0000 (01:44 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 11 Dec 2014 00:46:11 +0000 (01:46 +0100)
commit66daf3b81154078852a049b44fc477d5195cd0f5
treee5bffa054ee11c7e2e921d5c454261aaad7f1903
parent2a428db5e2c1d10ff5a7d5e8352eef8d195d440c
parentc7921a480467876ece06566e0efd8f6bce9d1903
Merge commit 'c7921a480467876ece06566e0efd8f6bce9d1903'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/libfdk-aacdec.c