Merge commit '1e9a93bfca2c2f43a07e01f2ef9fd5cbafe6c22d'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 7 Jul 2014 21:16:59 +0000 (23:16 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 7 Jul 2014 21:16:59 +0000 (23:16 +0200)
commit242b3c292a49cc620fae6554ab74e748392d9197
treeb946515645d5a175fca30ace4208bfafa36c0aa7
parent75be508f7c6ed946170eab3323f6749f84dbb8b8
parent1e9a93bfca2c2f43a07e01f2ef9fd5cbafe6c22d
Merge commit '1e9a93bfca2c2f43a07e01f2ef9fd5cbafe6c22d'

* commit '1e9a93bfca2c2f43a07e01f2ef9fd5cbafe6c22d':
  libfdk-aacdec: Decode the first AAC frame to reliably identify the bitstream

Conflicts:
libavcodec/version.h

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