Merge commit 'a6901b9c6bd51396c1159f1a07f9f5042328cda6'
authorClément Bœsch <u@pkh.me>
Mon, 17 Apr 2017 10:54:46 +0000 (12:54 +0200)
committerClément Bœsch <u@pkh.me>
Mon, 17 Apr 2017 10:54:46 +0000 (12:54 +0200)
commit99b35a51ccbe2fc98530e5cf7529e7d377e1165e
treee409a8ba94968d7ed094c9eb311dc0bfc21b620d
parentbb71eb944c7abe4eccb6b21d4771751feca22980
parenta6901b9c6bd51396c1159f1a07f9f5042328cda6
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@pkh.me>