From: Koen Kooi <koen@openembedded.org>
Date: Mon, 21 Sep 2009 17:39:32 +0000 (+0200)
Subject: ffmpeg: move default_preference for armv7a to svn version
X-Git-Tag: Release-2010-05/1~2329
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4122ade438a1718449337af8e1d24e81e67f3522;p=openembedded.git

ffmpeg: move default_preference for armv7a to svn version
---

diff --git a/recipes/ffmpeg/ffmpeg_git.bb b/recipes/ffmpeg/ffmpeg_git.bb
index bc17596b77..1cfc3e2f89 100644
--- a/recipes/ffmpeg/ffmpeg_git.bb
+++ b/recipes/ffmpeg/ffmpeg_git.bb
@@ -7,7 +7,6 @@ PV = "0.5.0+${PR}+gitr${SRCREV}"
 PR = "r0"
 
 DEFAULT_PREFERENCE = "-1"
-DEFAULT_PREFERENCE_armv7a = "1"
 
 #FFBRANCH_arm = "arm"
 FFBRANCH ?= "master"
diff --git a/recipes/ffmpeg/ffmpeg_svn.bb b/recipes/ffmpeg/ffmpeg_svn.bb
index 4888fe4f25..8091bc0505 100644
--- a/recipes/ffmpeg/ffmpeg_svn.bb
+++ b/recipes/ffmpeg/ffmpeg_svn.bb
@@ -9,13 +9,11 @@ PV = "0.5.0+${PR}+svnr${SRCREV}"
 PR = "r0"
 
 DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE_armv7a = "1"
 
 SRC_URI = "svn://svn.ffmpeg.org/ffmpeg/;module=trunk"
 
 S = "${WORKDIR}/trunk"
-
-DEFAULT_PREFERENCE = "-1"
-
 B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
 
 FULL_OPTIMIZATION_armv7a = "-fexpensive-optimizations  -ftree-vectorize -fomit-frame-pointer -O4 -ffast-math"