Merge "vp8e - entropy stats per frame type"

author Jim Bankoski <jimbankoski@google.com>

Mon, 12 Dec 2011 17:08:34 +0000 (09:08 -0800)

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

Mon, 12 Dec 2011 17:08:34 +0000 (09:08 -0800)
author Jim Bankoski <jimbankoski@google.com>
Mon, 12 Dec 2011 17:08:34 +0000 (09:08 -0800)
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
Mon, 12 Dec 2011 17:08:34 +0000 (09:08 -0800)
diff --cc vp8/encoder/onyx_if.c
Simple merge
diff --cc vp8/encoder/onyx_int.h
Simple merge
author	Jim Bankoski <jimbankoski@google.com>
	Mon, 12 Dec 2011 17:08:34 +0000 (09:08 -0800)
committer	Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
	Mon, 12 Dec 2011 17:08:34 +0000 (09:08 -0800)
		1	2
vp8/encoder/onyx_if.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp8/encoder/onyx_int.h	patch \|	diff1 \|	diff2 \|	blob \| history