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)
* commit '84784c297fe6a6e538a7e111dcdbd8b893c2d275':
  libfdk-aacdec: formatting cosmetics

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

Simple merge