Merge "vpxenc: add --aq-mode flag to control adaptive quantization"

author Guillaume Martres <smarter3@gmail.com>

Wed, 20 Nov 2013 16:13:28 +0000 (08:13 -0800)

committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org>

Wed, 20 Nov 2013 16:13:28 +0000 (08:13 -0800)
author Guillaume Martres <smarter3@gmail.com>
Wed, 20 Nov 2013 16:13:28 +0000 (08:13 -0800)
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
Wed, 20 Nov 2013 16:13:28 +0000 (08:13 -0800)
diff --cc vp9/encoder/vp9_encodeframe.c
Simple merge
diff --cc vp9/encoder/vp9_firstpass.c
Simple merge
diff --cc vp9/encoder/vp9_onyx_if.c
Simple merge
diff --cc vpxenc.c
Simple merge
author	Guillaume Martres <smarter3@gmail.com>
	Wed, 20 Nov 2013 16:13:28 +0000 (08:13 -0800)
committer	Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
	Wed, 20 Nov 2013 16:13:28 +0000 (08:13 -0800)
		1	2
vp9/encoder/vp9_encodeframe.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/encoder/vp9_firstpass.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/encoder/vp9_onyx_if.c	patch \|	diff1 \|	diff2 \|	blob \| history
vpxenc.c	patch \|	diff1 \|	diff2 \|	blob \| history