Merge changes Iea45fd22,If174d8dd,I9f539491 into nextgenv2

author Angie Chiang <angiebird@google.com>

Thu, 3 Dec 2015 22:29:03 +0000 (22:29 +0000)

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

Thu, 3 Dec 2015 22:29:03 +0000 (22:29 +0000)
author Angie Chiang <angiebird@google.com>
Thu, 3 Dec 2015 22:29:03 +0000 (22:29 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 3 Dec 2015 22:29:03 +0000 (22:29 +0000)
diff --cc vp10/common/idct.c
Simple merge
diff --cc vp10/encoder/rdopt.c
Simple merge
author	Angie Chiang <angiebird@google.com>
	Thu, 3 Dec 2015 22:29:03 +0000 (22:29 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Thu, 3 Dec 2015 22:29:03 +0000 (22:29 +0000)
		1	2
vp10/common/idct.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp10/encoder/rdopt.c	patch \|	diff1 \|	diff2 \|	blob \| history