ffmpeg: move default_preference for armv7a to svn version

diff --git a/recipes/ffmpeg/ffmpeg_git.bb b/recipes/ffmpeg/ffmpeg_git.bb
index bc17596b77fb708848751c0f6bc59b02c5f9d069..1cfc3e2f8964dda1e7beaea220c3d2f409102e1c 100644 (file)
--- 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 4888fe4f25ae79428e35e13fd6d0c32b72d0a33e..8091bc050512f787db2d225174667e6b2f983dc6 100644 (file)
--- 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"