Michael Niedermayer bc17a6f5c0 Merge remote-tracking branch 'qatar/master' ...

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

Conflicts:
	configure
	libavcodec/libvpxenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2012-11-08 08:07:05 +01:00

26 KiB

Raw Blame History

View Raw