Merge commit 'f9edc734e0ca3f6ef06c1ad0bd2c19c0c66f1ffa'
authorClément Bœsch <u@pkh.me>
Wed, 3 May 2017 10:28:54 +0000 (12:28 +0200)
committerClément Bœsch <u@pkh.me>
Wed, 3 May 2017 10:28:54 +0000 (12:28 +0200)
commitc3e08544100cdd7045f710bfcea33e07d9fcd25b
tree6241e88c8508480ceec1c8798049315a5cd803fb
parentbf0fde84d503280009e6f573ded2e43eae80901b
parentf9edc734e0ca3f6ef06c1ad0bd2c19c0c66f1ffa
Merge commit 'f9edc734e0ca3f6ef06c1ad0bd2c19c0c66f1ffa'

* commit 'f9edc734e0ca3f6ef06c1ad0bd2c19c0c66f1ffa':
  ratecontrol: Drop xvid-rc-related struct members unused after a6901b9c6

This commit is a noop, see 99b35a51ccbe2fc98530e5cf7529e7d377e1165e

Merged-by: Clément Bœsch <u@pkh.me>