[FFmpeg-cvslog] Merge commit 'a6901b9c6bd51396c1159f1a07f9f5042328cda6'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Mon Apr 17 12:54:46 2017 +0200| [99b35a51ccbe2fc98530e5cf7529e7d377e1165e] | committer: Clément Bœsch

Merge commit 'a6901b9c6bd51396c1159f1a07f9f5042328cda6'

* commit 'a6901b9c6bd51396c1159f1a07f9f5042328cda6':
  Drop libxvid rate control support for mpegvideo encoding

This commit is a noop, there is no known issue with it.

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

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