summaryrefslogtreecommitdiff
path: root/recipes/ffmpeg/ffmpeg-0.5
diff options
context:
space:
mode:
authorwoglinde <heinold@inf.fu-berlin.de>2009-04-01 23:29:41 +0200
committerwoglinde <heinold@inf.fu-berlin.de>2009-04-03 23:20:14 +0200
commit4c0ca67259d948024243d3748bf08eb93343ff8d (patch)
tree7362df92a2d76eaee943c66c393571f6486855b3 /recipes/ffmpeg/ffmpeg-0.5
parent27b5b2934e6dfd5421354efa32e5d9dd3c6ab47f (diff)
ffmpeg: fix armv4 arch, patch can be zapped if gcc-4.4 is out
Diffstat (limited to 'recipes/ffmpeg/ffmpeg-0.5')
-rw-r--r--recipes/ffmpeg/ffmpeg-0.5/armv4.patch16
1 files changed, 16 insertions, 0 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
++