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)
commit0c06ca7a8ab46df0268d049e7c2067ef29a5f77d
treea4f16925f82c2cca8fe993e7d6146f63aa894355
parent3ea5beab8f7352c94f71148ab98dd247412129a3
parenta90d92ce2aeea8eaae5c616958d20e000e20b964
Merge commit 'a90d92ce2aeea8eaae5c616958d20e000e20b964'

* commit 'a90d92ce2aeea8eaae5c616958d20e000e20b964':
  aac: K&R formatting cosmetics

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