Merge commit '6d8629aac13692447b54eac795bf74007ebf8987'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Jun 2013 08:00:51 +0000 (10:00 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Jun 2013 08:00:51 +0000 (10:00 +0200)
commit1bcfb1eea836e3c357732ece6d96f5c87938b6d6
tree5078deb27b3de5a85c1646437b9fcf545c5005a8
parentef906390043010cde8844ec30da79926f2f8b846
parent6d8629aac13692447b54eac795bf74007ebf8987
Merge commit '6d8629aac13692447b54eac795bf74007ebf8987'

* commit '6d8629aac13692447b54eac795bf74007ebf8987':
  aac: K&R formatting cosmetics

Conflicts:
libavcodec/aacdec.c

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