Revert "manifests: (All) Use updated libvpx to make ffmpeg happy"

This reverts commit 170b419ef6375f254584d32a6c2a7253a906e804

The version included with ICS should be new enough, the fact that ffmpeg doesn't see it as a current version needs to be
fixed elsewhere.

6 files changed, 6 insertions, 6 deletions

diff --git a/default.xml b/default.xml
index 06c5b6e04..17fb1600c 100644
--- a/default.xml
+++ b/default.xml
@@ -42,7 +42,6 @@
   <project path="system/core" name="platform/system/core" revision="linaro_android_4.0.1" />
   <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.0.1" />
   <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.0.1" />
-  <project path="external/libvpx" name="platform/external/libvpx" revision="linaro-master" />
 
   <!-- AOSP -->
   <project path="abi/cpp" name="platform/abi/cpp" />
@@ -121,6 +120,7 @@
   <project path="external/libpcap" name="platform/external/libpcap" />
   <project path="external/libphonenumber" name="platform/external/libphonenumber" />
   <project path="external/libpng" name="platform/external/libpng" />
+  <project path="external/libvpx" name="platform/external/libvpx" />
   <project path="external/libxml2" name="platform/external/libxml2" />
   <project path="external/libxslt" name="platform/external/libxslt" />
   <project path="external/llvm" name="platform/external/llvm" />
diff --git a/staging-iMX53.xml b/staging-iMX53.xml
index 98e98a090..886124253 100644
--- a/staging-iMX53.xml
+++ b/staging-iMX53.xml
@@ -43,7 +43,6 @@
   <project path="system/core" name="platform/system/core" revision="linaro_android_4.0.1" />
   <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.0.1" />
   <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.0.1" />
-  <project path="external/libvpx" name="platform/external/libvpx" revision="linaro-master" />
 
   <!-- AOSP -->
   <project path="abi/cpp" name="platform/abi/cpp" />
@@ -122,6 +121,7 @@
   <project path="external/libpcap" name="platform/external/libpcap" />
   <project path="external/libphonenumber" name="platform/external/libphonenumber" />
   <project path="external/libpng" name="platform/external/libpng" />
+  <project path="external/libvpx" name="platform/external/libvpx" />
   <project path="external/libxml2" name="platform/external/libxml2" />
   <project path="external/libxslt" name="platform/external/libxslt" />
   <project path="external/llvm" name="platform/external/llvm" />
diff --git a/staging-origen.xml b/staging-origen.xml
index a7fb7f64e..0ccbdddff 100644
--- a/staging-origen.xml
+++ b/staging-origen.xml
@@ -51,7 +51,6 @@
   <project path="system/core" name="platform/system/core" revision="linaro_android_4.0.1" />
   <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.0.1" />
   <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.0.1" />
-  <project path="external/libvpx" name="platform/external/libvpx" revision="linaro-master" />
 
   <!-- AOSP -->
   <project path="abi/cpp" name="platform/abi/cpp" />
@@ -130,6 +129,7 @@
   <project path="external/libpcap" name="platform/external/libpcap" />
   <project path="external/libphonenumber" name="platform/external/libphonenumber" />
   <project path="external/libpng" name="platform/external/libpng" />
+  <project path="external/libvpx" name="platform/external/libvpx" />
   <project path="external/libxml2" name="platform/external/libxml2" />
   <project path="external/libxslt" name="platform/external/libxslt" />
   <project path="external/llvm" name="platform/external/llvm" />
diff --git a/staging-panda.xml b/staging-panda.xml
index f3379cad9..21daa0fa8 100644
--- a/staging-panda.xml
+++ b/staging-panda.xml
@@ -42,7 +42,6 @@
   <project path="system/core" name="platform/system/core" revision="linaro_android_4.0.1" />
   <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.0.1" />
   <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.0.1" />
-  <project path="external/libvpx" name="platform/external/libvpx" revision="linaro-master" />
 
   <!-- AOSP -->
   <project path="abi/cpp" name="platform/abi/cpp" />
@@ -121,6 +120,7 @@
   <project path="external/libpcap" name="platform/external/libpcap" />
   <project path="external/libphonenumber" name="platform/external/libphonenumber" />
   <project path="external/libpng" name="platform/external/libpng" />
+  <project path="external/libvpx" name="platform/external/libvpx" />
   <project path="external/libxml2" name="platform/external/libxml2" />
   <project path="external/libxslt" name="platform/external/libxslt" />
   <project path="external/llvm" name="platform/external/llvm" />
diff --git a/staging-snowball.xml b/staging-snowball.xml
index d79deba80..a15e08bff 100644
--- a/staging-snowball.xml
+++ b/staging-snowball.xml
@@ -46,7 +46,6 @@
   <project path="system/core" name="platform/system/core" revision="linaro_android_4.0.1" />
   <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.0.1" />
   <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.0.1" />
-  <project path="external/libvpx" name="platform/external/libvpx" revision="linaro-master" />
 
   <!-- AOSP -->
   <project path="abi/cpp" name="platform/abi/cpp" />
@@ -125,6 +124,7 @@
   <project path="external/libpcap" name="platform/external/libpcap" />
   <project path="external/libphonenumber" name="platform/external/libphonenumber" />
   <project path="external/libpng" name="platform/external/libpng" />
+  <project path="external/libvpx" name="platform/external/libvpx" />
   <project path="external/libxml2" name="platform/external/libxml2" />
   <project path="external/libxslt" name="platform/external/libxslt" />
   <project path="external/llvm" name="platform/external/llvm" />
diff --git a/tracking-panda.xml b/tracking-panda.xml
index de29f7f1e..0bb2a5a8c 100644
--- a/tracking-panda.xml
+++ b/tracking-panda.xml
@@ -42,7 +42,6 @@
   <project path="system/core" name="platform/system/core" revision="linaro_android_4.0.1" />
   <project path="frameworks/compile/slang" name="platform/frameworks/compile/slang" revision="linaro_android_4.0.1" />
   <project path="hardware/ti/omap4xxx" name="platform/hardware/ti/omap4xxx" revision="linaro_android_4.0.1" />
-  <project path="external/libvpx" name="platform/external/libvpx" revision="linaro-master" />
 
   <!-- AOSP -->
   <project path="abi/cpp" name="platform/abi/cpp" />
@@ -121,6 +120,7 @@
   <project path="external/libpcap" name="platform/external/libpcap" />
   <project path="external/libphonenumber" name="platform/external/libphonenumber" />
   <project path="external/libpng" name="platform/external/libpng" />
+  <project path="external/libvpx" name="platform/external/libvpx" />
   <project path="external/libxml2" name="platform/external/libxml2" />
   <project path="external/libxslt" name="platform/external/libxslt" />
   <project path="external/llvm" name="platform/external/llvm" />