summaryrefslogtreecommitdiff
path: root/recipes
diff options
context:
space:
mode:
Diffstat (limited to 'recipes')
-rw-r--r--recipes/ffmpeg/ffmpeg_git.bb1
-rw-r--r--recipes/ffmpeg/ffmpeg_svn.bb4
2 files changed, 1 insertions, 4 deletions
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"