Merge commit '84784c297fe6a6e538a7e111dcdbd8b893c2d275'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 24 Aug 2013 09:21:25 +0000 (11:21 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 24 Aug 2013 09:23:25 +0000 (11:23 +0200)
commitedf6fb64e07c277a1aad2cd0a57a9b4c1b33c29a
treed2d40cba0bac9985c9e8b23766a1fbfd2ff8adb1
parentf9418d156fe641af50d05114a9787a3bdb579369
parent84784c297fe6a6e538a7e111dcdbd8b893c2d275
Merge commit '84784c297fe6a6e538a7e111dcdbd8b893c2d275'

* commit '84784c297fe6a6e538a7e111dcdbd8b893c2d275':
  libfdk-aacdec: formatting cosmetics

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