[FFmpeg-cvslog] Merge commit 'fd9147f11456a7e39a998d7270684922a2a46e6d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jan 10 12:15:21 2013 +0100| [8c7de73e20ebd0435f7ddd75d57ffb7179c40b77] | committer: Michael Niedermayer

Merge commit 'fd9147f11456a7e39a998d7270684922a2a46e6d'

* commit 'fd9147f11456a7e39a998d7270684922a2a46e6d':
  au: cosmetics: pretty-print and remove pointless comments

Conflicts:
	libavformat/au.c

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

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