Merge commit 'f61272f0efd80da437570aad2c40e00f9d3f4fe6'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 12 Jan 2013 12:32:13 +0000 (13:32 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 12 Jan 2013 12:32:13 +0000 (13:32 +0100)
commit15daa8f9ddaf678b924ebe997f7b62381c0e2e0a
treea61799d00fe85fbc8ef097a6dcec6dc704c79235
parente730c3a2cbc4070f3e1799d2a6789f239f7377b1
parentf61272f0efd80da437570aad2c40e00f9d3f4fe6
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@gmx.at>
libavcodec/ratecontrol.c
libavformat/rtpdec.c