[FFmpeg-cvslog] Merge commit '5c9c305d14730faf2af206e5d519df4948de0ed2'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Mar  2 21:44:44 2014 +0100| [411f8f4c9a05796e22e12bf0a22c967f28c2d430] | committer: Michael Niedermayer

Merge commit '5c9c305d14730faf2af206e5d519df4948de0ed2'

* commit '5c9c305d14730faf2af206e5d519df4948de0ed2':
  ass: K&R formatting cosmetics

Conflicts:
	libavformat/assdec.c

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

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