Add x264 and ffmpeg in all builds

Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>

4 files changed, 20 insertions, 4 deletions

diff --git a/staging-omap4460.xml b/staging-omap4460.xml
index 8f8fa2db3..f98c72df0 100644
--- a/staging-omap4460.xml
+++ b/staging-omap4460.xml
@@ -47,6 +47,11 @@
 
   <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_2.3.5" remote="linaro-android" />
 
+  <!-- Multimedia extensions -->
+  <project path="external/libvpx" name="platform/external/libvpx" revision="linaro-master" remote="linaro-android" />
+  <project path="external/x264" name="platform/external/x264" revision="linaro-master" remote="linaro-android" />
+  <project path="external/ffmpeg" name="platform/external/ffmpeg" revision="linaro-0.8" remote="linaro-android" />
+
   <!-- Power WG -->
   <project path="external/powertop" name="platform/external/powertop"  remote="linaro-android" revision="linaro" />
   <project path="external/ncurses" name="platform/external/ncurses"  remote="linaro-android" revision="linaro" />
@@ -127,7 +132,6 @@
   <project path="external/libnfc-nxp" name="platform/external/libnfc-nxp" />
   <project path="external/libpcap" name="platform/external/libpcap" />
   <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/mtpd" name="platform/external/mtpd" />
   <project path="external/netcat" name="platform/external/netcat" />
diff --git a/staging-origen.xml b/staging-origen.xml
index 452983560..41cca87d2 100644
--- a/staging-origen.xml
+++ b/staging-origen.xml
@@ -49,6 +49,11 @@
   <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_2.3.5" remote="linaro-android" />
   <project path="external/wpa_supplicant_6" name="platform/external/wpa_supplicant_6" revision="linaro_android_2.3.5" remote="linaro-android"/>
 
+  <!-- Multimedia extensions -->
+  <project path="external/libvpx" name="platform/external/libvpx" revision="linaro-master" remote="linaro-android" />
+  <project path="external/x264" name="platform/external/x264" revision="linaro-master" remote="linaro-android" />
+  <project path="external/ffmpeg" name="platform/external/ffmpeg" revision="linaro-0.8" remote="linaro-android" />
+
   <!-- Power WG -->
   <project path="external/powertop" name="platform/external/powertop"  remote="linaro-android" revision="linaro" />
   <project path="external/ncurses" name="platform/external/ncurses"  remote="linaro-android" revision="linaro" />
@@ -127,7 +132,6 @@
   <project path="external/libnfc-nxp" name="platform/external/libnfc-nxp" />
   <project path="external/libpcap" name="platform/external/libpcap" />
   <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/mtpd" name="platform/external/mtpd" />
   <project path="external/netcat" name="platform/external/netcat" />
diff --git a/staging-panda.xml b/staging-panda.xml
index 54ad6bf2c..be75a7d38 100644
--- a/staging-panda.xml
+++ b/staging-panda.xml
@@ -47,6 +47,11 @@
   <project path="hardware/libhardware_legacy" name="platform/hardware/libhardware_legacy" revision="linaro_android_2.3.5" remote="linaro-android" />
   <project path="external/wpa_supplicant_6" name="platform/external/wpa_supplicant_6" revision="linaro_android_2.3.5" remote="linaro-android"/>
 
+  <!-- Multimedia extensions -->
+  <project path="external/libvpx" name="platform/external/libvpx" revision="linaro-master" remote="linaro-android" />
+  <project path="external/x264" name="platform/external/x264" revision="linaro-master" remote="linaro-android" />
+  <project path="external/ffmpeg" name="platform/external/ffmpeg" revision="linaro-0.8" remote="linaro-android" />
+
   <!-- Power WG -->
   <project path="external/powertop" name="platform/external/powertop"  remote="linaro-android" revision="linaro" />
   <project path="external/ncurses" name="platform/external/ncurses"  remote="linaro-android" revision="linaro" />
@@ -134,7 +139,6 @@
   <project path="external/libnfc-nxp" name="platform/external/libnfc-nxp" />
   <project path="external/libpcap" name="platform/external/libpcap" />
   <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/mtpd" name="platform/external/mtpd" />
   <project path="external/netcat" name="platform/external/netcat" />
diff --git a/staging-snowball.xml b/staging-snowball.xml
index 3cda822cd..ed0dd92fb 100644
--- a/staging-snowball.xml
+++ b/staging-snowball.xml
@@ -46,6 +46,11 @@
   <project path="external/stlport" name="platform/external/stlport" revision="linaro_android_2.3.5" remote="linaro-android" />
   <project path="hardware/libhardware" name="platform/hardware/libhardware" revision="linaro_android_2.3.5" remote="linaro-android" />
 
+  <!-- Multimedia extensions -->
+  <project path="external/libvpx" name="platform/external/libvpx" revision="linaro-master" remote="linaro-android" />
+  <project path="external/x264" name="platform/external/x264" revision="linaro-master" remote="linaro-android" />
+  <project path="external/ffmpeg" name="platform/external/ffmpeg" revision="linaro-0.8" remote="linaro-android" />
+
   <!-- Power WG -->
   <project path="external/powertop" name="platform/external/powertop"  remote="linaro-android" revision="linaro" />
   <project path="external/ncurses" name="platform/external/ncurses"  remote="linaro-android" revision="linaro" />
@@ -125,7 +130,6 @@
   <project path="external/libnfc-nxp" name="platform/external/libnfc-nxp" />
   <project path="external/libpcap" name="platform/external/libpcap" />
   <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/mtpd" name="platform/external/mtpd" />
   <project path="external/netcat" name="platform/external/netcat" />