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)
* commit 'c7921a480467876ece06566e0efd8f6bce9d1903':
  libfdk-aacdec: Fix a boundary check

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

Simple merge