summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--recipes/ffmpeg/ffmpeg-0.5/armv4.patch16
-rw-r--r--recipes/ffmpeg/ffmpeg_0.5.bb4
2 files changed, 19 insertions, 1 deletions
diff --git a/recipes/ffmpeg/ffmpeg-0.5/armv4.patch b/recipes/ffmpeg/ffmpeg-0.5/armv4.patch
new file mode 100644
index 0000000000..53016b938d
--- /dev/null
+++ b/recipes/ffmpeg/ffmpeg-0.5/armv4.patch
@@ -0,0 +1,16 @@
+Index: ffmpeg-0.5/libavcodec/arm/dsputil_arm_s.S
+===================================================================
+--- ffmpeg-0.5.orig/libavcodec/arm/dsputil_arm_s.S 2009-04-01 23:20:21.590344985 +0200
++++ ffmpeg-0.5/libavcodec/arm/dsputil_arm_s.S 2009-04-01 23:21:29.952427128 +0200
+@@ -722,5 +722,11 @@
+ bne 1b
+
+ pop {r4-r10}
++#if defined(__ARM_ARCH_2__) || defined(__ARM_ARCH_3__) \
++ || defined(__ARM_ARCH_3M__) || defined(__ARM_ARCH_4__)
++ mov pc, lr
++#else
+ bx lr
++#endif
+ .endfunc
++
diff --git a/recipes/ffmpeg/ffmpeg_0.5.bb b/recipes/ffmpeg/ffmpeg_0.5.bb
index 698f45c83b..54db0042e3 100644
--- a/recipes/ffmpeg/ffmpeg_0.5.bb
+++ b/recipes/ffmpeg/ffmpeg_0.5.bb
@@ -8,7 +8,9 @@ PR = "r1"
DEFAULT_PREFERENCE = "1"
SRCREV_libswscale = "b2e1c8222eeef74b0ca8053b400957dd69e18e4d"
-SRC_URI = "http://ffmpeg.org/releases/ffmpeg-${PV}.tar.bz2"
+SRC_URI = "http://ffmpeg.org/releases/ffmpeg-${PV}.tar.bz2 \
+ file://armv4.patch;patch=1 \
+ "
#S = "${WORKDIR}/git"
B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"