[FFmpeg-cvslog] Merge commit '8c09532672d7d3196ec52afefa2c96633bc17b62'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Mar  9 01:05:37 2014 +0100| [2beb81522e5994a377170a56f8f38b6a550e3f3b] | committer: Michael Niedermayer

Merge commit '8c09532672d7d3196ec52afefa2c96633bc17b62'

* commit '8c09532672d7d3196ec52afefa2c96633bc17b62':
  rv10: K&R formatting cosmetics

Conflicts:
	libavcodec/rv10.c

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

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