[FFmpeg-cvslog] Merge commit '6d8629aac13692447b54eac795bf74007ebf8987'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jun 28 10:00:51 2013 +0200| [1bcfb1eea836e3c357732ece6d96f5c87938b6d6] | committer: Michael Niedermayer

Merge commit '6d8629aac13692447b54eac795bf74007ebf8987'

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

Conflicts:
	libavcodec/aacdec.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1bcfb1eea836e3c357732ece6d96f5c87938b6d6
---