Merge "Delay auto key frame insertion in realtime configuration"

author John Koleszar <jkoleszar@google.com>

Fri, 4 Feb 2011 13:16:15 +0000 (05:16 -0800)

committer Code Review <code-review@webmproject.org>

Fri, 4 Feb 2011 13:16:15 +0000 (05:16 -0800)
author John Koleszar <jkoleszar@google.com>
Fri, 4 Feb 2011 13:16:15 +0000 (05:16 -0800)
committer Code Review <code-review@webmproject.org>
Fri, 4 Feb 2011 13:16:15 +0000 (05:16 -0800)
diff --cc vp8/encoder/onyx_if.c
Simple merge
diff --cc vp8/encoder/onyx_int.h
Simple merge
author	John Koleszar <jkoleszar@google.com>
	Fri, 4 Feb 2011 13:16:15 +0000 (05:16 -0800)
committer	Code Review <code-review@webmproject.org>
	Fri, 4 Feb 2011 13:16:15 +0000 (05:16 -0800)
		1	2
vp8/encoder/onyx_if.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp8/encoder/onyx_int.h	patch \|	diff1 \|	diff2 \|	blob \| history