Merge commit '2dbd35b00c6433e587d5f44d5dbc8972ebbaa88e'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 8 Jan 2015 16:35:17 +0000 (17:35 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 8 Jan 2015 16:36:48 +0000 (17:36 +0100)
commit3fd3647fdc5b13348df299a70ada00d712ff84e4
tree51dbe8c61330a845abed47a228e7250d31aa85b3
parent93870f0a0b71328d4502d8f979481e42e3cb71b4
parent2dbd35b00c6433e587d5f44d5dbc8972ebbaa88e
Merge commit '2dbd35b00c6433e587d5f44d5dbc8972ebbaa88e'

* commit '2dbd35b00c6433e587d5f44d5dbc8972ebbaa88e':
  libfdk-aacdec: Make sure decoding doesn't add any extra delay in the latest version of fdk-aac

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