Merge "vp8: make gf_group_bits 64-bit"

author James Zern <jzern@google.com>

Fri, 22 Feb 2013 23:31:28 +0000 (15:31 -0800)

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

Fri, 22 Feb 2013 23:31:28 +0000 (15:31 -0800)
author James Zern <jzern@google.com>
Fri, 22 Feb 2013 23:31:28 +0000 (15:31 -0800)
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
Fri, 22 Feb 2013 23:31:28 +0000 (15:31 -0800)
diff --cc vp8/encoder/firstpass.c
Simple merge
diff --cc vp9/encoder/vp9_firstpass.c
Simple merge
author	James Zern <jzern@google.com>
	Fri, 22 Feb 2013 23:31:28 +0000 (15:31 -0800)
committer	Gerrit Code Review <gerrit@gerrit.golo.chromium.org>
	Fri, 22 Feb 2013 23:31:28 +0000 (15:31 -0800)
		1	2
vp8/encoder/firstpass.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/encoder/vp9_firstpass.c	patch \|	diff1 \|	diff2 \|	blob \| history