Merge "Remove CONSTRAIN_NEIGHBORING_MIN_MAX."

author paulwilkins <paulwilkins@google.com>

Tue, 5 May 2015 09:32:09 +0000 (09:32 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Tue, 5 May 2015 09:32:11 +0000 (09:32 +0000)
author paulwilkins <paulwilkins@google.com>
Tue, 5 May 2015 09:32:09 +0000 (09:32 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 5 May 2015 09:32:11 +0000 (09:32 +0000)
diff --cc vp9/encoder/vp9_encodeframe.c
Simple merge
diff --cc vp9/encoder/vp9_speed_features.c
Simple merge
diff --cc vp9/encoder/vp9_speed_features.h
Simple merge
author	paulwilkins <paulwilkins@google.com>
	Tue, 5 May 2015 09:32:09 +0000 (09:32 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Tue, 5 May 2015 09:32:11 +0000 (09:32 +0000)
		1	2
vp9/encoder/vp9_encodeframe.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/encoder/vp9_speed_features.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp9/encoder/vp9_speed_features.h	patch \|	diff1 \|	diff2 \|	blob \| history