[FFmpeg-cvslog] avcodec/arm/videodsp_armv5te: Fix linking failure with " g++ -shared -D__STDC_CONSTANT_MACROS -o test.so ... libavcodec.a"

Michael Niedermayer git at videolan.org
Fri Feb 13 20:59:57 CET 2015


ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Thu Feb 12 16:35:29 2015 +0100| [1a263f0dd96a7acae8a5d9290cd158b03dfaca82] | committer: Michael Niedermayer

avcodec/arm/videodsp_armv5te: Fix linking failure with "g++ -shared -D__STDC_CONSTANT_MACROS -o test.so ... libavcodec.a"

Tested-by: Andreas Haupt
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit cab6302534962331753fb69c674df86a458b098d)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1a263f0dd96a7acae8a5d9290cd158b03dfaca82
---

 libavcodec/arm/videodsp_armv5te.S |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavcodec/arm/videodsp_armv5te.S b/libavcodec/arm/videodsp_armv5te.S
index 55bcce5..aff1161 100644
--- a/libavcodec/arm/videodsp_armv5te.S
+++ b/libavcodec/arm/videodsp_armv5te.S
@@ -23,9 +23,10 @@
 #include "libavutil/arm/asm.S"
 
 function ff_prefetch_arm, export=1
+1:
         subs            r2,  r2,  #1
         pld             [r0]
         add             r0,  r0,  r1
-        bne             X(ff_prefetch_arm)
+        bne             1b
         bx              lr
 endfunc



More information about the ffmpeg-cvslog mailing list