summaryrefslogtreecommitdiff
path: root/packages/ffmpeg
diff options
context:
space:
mode:
authorTim 'timtim' Ellis <tim.ellis@foonas.org>2009-02-02 20:25:42 +0000
committerTim 'timtim' Ellis <tim.ellis@foonas.org>2009-02-02 20:25:42 +0000
commit05b19d12d5a32d1ab7708660e9dcede2b2bf1dc8 (patch)
tree0de8df0d66ce42d52a1a75b57a22c7fd19109e43 /packages/ffmpeg
parent2fd602f817581ff24630e6fd7d4ab0b80125e13d (diff)
parentdac353e6032fbdd944a3fcacb85c91ad746d5f1f (diff)
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'packages/ffmpeg')
-rw-r--r--packages/ffmpeg/ffmpeg_git.bb4
1 files changed, 1 insertions, 3 deletions
diff --git a/packages/ffmpeg/ffmpeg_git.bb b/packages/ffmpeg/ffmpeg_git.bb
index 42e34d5d5b..b2b854aed8 100644
--- a/packages/ffmpeg/ffmpeg_git.bb
+++ b/packages/ffmpeg/ffmpeg_git.bb
@@ -7,9 +7,7 @@ PV = "0.4.9+${PR}+gitr${SRCREV}"
PR = "r38"
DEFAULT_PREFERENCE = "-1"
-DEFAULT_PREFERENCE_armv5te = "1"
-DEFAULT_PREFERENCE_armv6 = "1"
-DEFAULT_PREFERENCE_armv7a = "1"
+DEFAULT_PREFERENCE_arm = "1"
DEFAULT_PREFERENCE_avr32 = "1"
FFBRANCH_arm = "arm"