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)
commit1df08cae82d75e01b1250bb9416d6cfbab430e82
treea064c88d0de083e64c66c4f946e64890b26f3e98
parentba5d08938130b2545f8b3e73a701989563316e49
parentb4bb9593834460bbbe0e70823f2c503cb01ad052
Merge commit 'b4bb9593834460bbbe0e70823f2c503cb01ad052'

* commit 'b4bb9593834460bbbe0e70823f2c503cb01ad052':
  ratecontrol: Drop commented out cruft

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