commit ee0f4835e065ef08a6283e3f86cdc671a5a156c7
author Jason Sams <jsams@google.com> Wed Apr 23 15:21:34 2014 -0700
committer Jason Sams <jsams@google.com> Wed Apr 23 15:22:09 2014 -0700
tree 43ae343769cea79183631ad96c70c1936b1ea7fb
parent 087fa6e19968b55e5fae7aa38971c8ec63b616c6

Revert "Add VP9 inter-frame prediction intrinsic"

This reverts commit 60498fe9679ea25a260a503d6dfd27cbc0a0c079.

Change-Id: I4d8bb284793874a08c0cc991c0e04ecc104e1e0f

Conflicts:
	cpu_ref/Android.mk
	cpu_ref/rsCpuCore.cpp
	rsDefines.h

rsDefines.h

diff --git a/rsDefines.h b/rsDefines.h
index 5efb2f1..1731eb7 100644
--- a/rsDefines.h
+++ b/rsDefines.h
@@ -365,7 +365,7 @@
     RS_SCRIPT_INTRINSIC_ID_BLEND = 7,
     RS_SCRIPT_INTRINSIC_ID_3DLUT = 8,
     RS_SCRIPT_INTRINSIC_ID_HISTOGRAM = 9,
-    RS_SCRIPT_INTRINSIC_ID_INTER_PRED= 10,
+    // unused 10
     RS_SCRIPT_INTRINSIC_ID_LOOP_FILTER = 11,
     RS_SCRIPT_INTRINSIC_ID_RESIZE = 12
 };