aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/webm
diff options
context:
space:
mode:
authorTom Rini <tom_rini@mentor.com>2011-03-01 14:04:34 -0700
committerTom Rini <tom_rini@mentor.com>2011-03-01 14:04:34 -0700
commit5205a53c996769f1e1156c175619db48ce4ef4ac (patch)
tree71211cf6058d36df634832ca26da3337701563a3 /recipes/webm
parent8c6a3711e329522bf1fd2e6c020509c122c235ab (diff)
downloadopenembedded-5205a53c996769f1e1156c175619db48ce4ef4ac.tar.gz
Revert "libvpx: force arm mode to be able to link with ffmpeg where arm mode already is forced"
We back this out after the release in order to not mask the problem. This reverts commit 8c6a3711e329522bf1fd2e6c020509c122c235ab.
Diffstat (limited to 'recipes/webm')
-rw-r--r--recipes/webm/libvpx.inc6
1 files changed, 1 insertions, 5 deletions
diff --git a/recipes/webm/libvpx.inc b/recipes/webm/libvpx.inc
index fd82d77a6a..a1e02b112f 100644
--- a/recipes/webm/libvpx.inc
+++ b/recipes/webm/libvpx.inc
@@ -1,15 +1,11 @@
DESCRIPTION = "vpx Multi-Format Codec SDK"
LICENSE = "BSD"
-INC_PR = "r7"
+INC_PR = "r6"
SRC_URI = "http://webm.googlecode.com/files/libvpx-v${PV}.tar.bz2"
S = "${WORKDIR}/libvpx-v${PV}"
-# ffmpeg links with this and fails
-# sysroots/armv4t-oe-linux-gnueabi/usr/lib/libvpx.a(vpx_encoder.c.o)(.text+0xc4): unresolvable R_ARM_THM_CALL relocation against symbol `memcpy@@GLIBC_2.4'
-ARM_INSTRUCTION_SET = "arm"
-
CFLAGS += "-fPIC"
export CC