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)
* 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>
1  2 
libavcodec/libfdk-aacdec.c

Simple merge