[FFmpeg-cvslog] Merge commit '1c88617b9421c9af8ae961c05d2381b19c585026'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 22 10:50:05 2013 +0200| [e381cc3e4ea61b5d42b45162ef6969a90a0507c9] | committer: Michael Niedermayer

Merge commit '1c88617b9421c9af8ae961c05d2381b19c585026'

* commit '1c88617b9421c9af8ae961c05d2381b19c585026':
  riff: K&R formatting cosmetics

Conflicts:
	libavformat/riff.c

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

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