Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 8 Nov 2012 07:07:05 +0000 (08:07 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 8 Nov 2012 07:07:05 +0000 (08:07 +0100)
commitbc17a6f5c012522186592fcbc3acaa7701c4b208
tree39f9098fca3f6fff152298bc819078428694cf22
parent78e08fd340e03b49f75e1ac31c20cc21434794bd
parent12776d5d2a46363c52603ae2be888a3094fce1c6
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>
libavcodec/libvpxenc.c