* qatar/master:
  libvpxenc: Allow enabling constrained quality (CQ) mode

Conflicts:
	configure
	libavcodec/libvpxenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>