Merge commit 'd639dcdae022130078c9c84b7b691c5e9694786c'
authorClément Bœsch <u@pkh.me>
Wed, 1 Feb 2017 13:21:36 +0000 (14:21 +0100)
committerClément Bœsch <u@pkh.me>
Wed, 1 Feb 2017 13:21:36 +0000 (14:21 +0100)
commit566bfd59c963938e183d523be9216b3f95ad8a09
tree1c22e7de6792dbe4477340cbc2fc5722fad2153b
parente4d65434633b67fd03d379fe9d0ab9dc97d767dc
parentd639dcdae022130078c9c84b7b691c5e9694786c
Merge commit 'd639dcdae022130078c9c84b7b691c5e9694786c'

* commit 'd639dcdae022130078c9c84b7b691c5e9694786c':
  ratecontrol: Move Xvid-related functions to the place they are actually used

Merged-by: Clément Bœsch <u@pkh.me>
libavcodec/libxvid.h
libavcodec/mpegvideo_enc.c
libavcodec/ratecontrol.c
libavcodec/ratecontrol.h