Merge commit 'b4bb9593834460bbbe0e70823f2c503cb01ad052'
authorJames Almer <jamrial@gmail.com>
Tue, 31 Jan 2017 18:50:56 +0000 (15:50 -0300)
committerJames Almer <jamrial@gmail.com>
Tue, 31 Jan 2017 18:50:56 +0000 (15:50 -0300)
* commit 'b4bb9593834460bbbe0e70823f2c503cb01ad052':
  ratecontrol: Drop commented out cruft

Merged-by: James Almer <jamrial@gmail.com>
1  2 
libavcodec/ratecontrol.c

Simple merge