Merge commit 'a90d92ce2aeea8eaae5c616958d20e000e20b964'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 3 May 2014 21:21:21 +0000 (23:21 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 3 May 2014 21:21:26 +0000 (23:21 +0200)
* commit 'a90d92ce2aeea8eaae5c616958d20e000e20b964':
  aac: K&R formatting cosmetics

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

Simple merge