[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar 14 12:00:45 2014 +0100| [b5bdd04f0818568a3ab663f6aca36df3c7b2b537] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  aac: K&R formatting cosmetics

Conflicts:
	libavformat/aacdec.c

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

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