[FFmpeg-cvslog] Merge commit '90558e848a29ef1e85ecb1832ad9a26eebe958e0'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Oct 13 15:35:05 2012 +0200| [c55bebe2cc7bd444f83a678babc1b287aa7a3da1] | committer: Michael Niedermayer

Merge commit '90558e848a29ef1e85ecb1832ad9a26eebe958e0'

* commit '90558e848a29ef1e85ecb1832ad9a26eebe958e0':
  rangecoder: K&R formatting cosmetics

Conflicts:
	libavcodec/rangecoder.c
	libavcodec/rangecoder.h

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

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