[oe-commits] Koen Kooi : ffmpeg: move default_preference for armv7a to svn version

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 4122ade438a1718449337af8e1d24e81e67f3522
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=4122ade438a1718449337af8e1d24e81e67f3522

Author: Koen Kooi <koen at openembedded.org>
Date:   Mon Sep 21 19:39:32 2009 +0200

ffmpeg: move default_preference for armv7a to svn version

---

 recipes/ffmpeg/ffmpeg_git.bb |    1 -
 recipes/ffmpeg/ffmpeg_svn.bb |    4 +---
 2 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/recipes/ffmpeg/ffmpeg_git.bb b/recipes/ffmpeg/ffmpeg_git.bb
index bc17596..1cfc3e2 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 4888fe4..8091bc0 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"