[FFmpeg-cvslog] Merge commit 'f61272f0efd80da437570aad2c40e00f9d3f4fe6'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jan 12 13:32:13 2013 +0100| [15daa8f9ddaf678b924ebe997f7b62381c0e2e0a] | committer: Michael Niedermayer

Merge commit 'f61272f0efd80da437570aad2c40e00f9d3f4fe6'

* commit 'f61272f0efd80da437570aad2c40e00f9d3f4fe6':
  ratecontrol: K&R cosmetic formatting
  rtpdec: Remove a useless todo comment

Conflicts:
	libavcodec/ratecontrol.c

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

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