[FFmpeg-cvslog] Merge commit 'f9edc734e0ca3f6ef06c1ad0bd2c19c0c66f1ffa'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Wed May  3 12:28:54 2017 +0200| [c3e08544100cdd7045f710bfcea33e07d9fcd25b] | committer: Clément Bœsch

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 at pkh.me>

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