commit 7797d1845f8778543a70d2e7cd99f30631c4b81d
author Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> Mon Jun 10 20:06:17 2013 +0200
committer Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> Mon Jun 10 20:06:17 2013 +0200
tree e12519c3a36f80263941140919f8ccc5e79d04fb
parent 5575e84a161b24876a124f8efeccabc7eba9a1a2

Get ffmpeg from linaro-1.2.1 branch

Change-Id: Iab240f43c7fb0f2324327ad47745cbaf8cf29080
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>

default.xml

diff --git a/default.xml b/default.xml
index ba370ab..fdda5e4 100644
--- a/default.xml
+++ b/default.xml
@@ -55,7 +55,7 @@
   <project path="external/busybox" name="platform/external/busybox" revision="linaro-1.21" groups="common" />
   <project path="external/lrzsz" name="platform/external/lrzsz" revision="linaro-master" groups="common" />
   <project path="external/x264" name="platform/external/x264" revision="linaro-master" groups="common" />
-  <project path="external/ffmpeg" name="platform/external/ffmpeg" revision="linaro-0.11.1" groups="common" />
+  <project path="external/ffmpeg" name="platform/external/ffmpeg" revision="linaro-1.2.1" groups="common" />
   <project path="external/speex" name="platform/external/speex" revision="linaro_mmwg" groups="common" />
   <project path="device/samsung/proprietary-open" name="device/samsung/proprietary-open" revision="linaro-jb" groups="common" />
   <project path="u-boot/linaro/arndale" name="landing-teams/working/samsung/u-boot" revision="tracking" remote="linaro-other" groups="arndale" />

tracking-origen-quad.xml

diff --git a/tracking-origen-quad.xml b/tracking-origen-quad.xml
index 1886efa..6ec89ee 100644
--- a/tracking-origen-quad.xml
+++ b/tracking-origen-quad.xml
@@ -45,7 +45,7 @@
   <project path="external/busybox" name="platform/external/busybox" revision="linaro-1.21" />
   <project path="external/lrzsz" name="platform/external/lrzsz" revision="linaro-master" />
   <project path="external/x264" name="platform/external/x264" revision="linaro-master" />
-  <project path="external/ffmpeg" name="platform/external/ffmpeg" revision="linaro-1.0.1" />
+  <project path="external/ffmpeg" name="platform/external/ffmpeg" revision="linaro-1.2.1" />
   <project path="external/speex" name="platform/external/speex" revision="linaro_mmwg" />
   <project path="device/samsung/proprietary-open" name="device/samsung/proprietary-open" revision="linaro-jb" />
   <project path="u-boot" name="landing-teams/working/samsung/u-boot" revision="tracking" remote="linaro-other"/>