diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-12 16:35:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-13 20:48:09 +0100 |
| commit | 1a263f0dd96a7acae8a5d9290cd158b03dfaca82 (patch) | |
| tree | af9e934a42c710acd4add44677ed9041619d7ead | |
| parent | 492818d724d910d3b5933c5f762b5151f764bbea (diff) | |
| download | ffmpeg-1a263f0dd96a7acae8a5d9290cd158b03dfaca82.tar.gz | |
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@gmx.at>
(cherry picked from commit cab6302534962331753fb69c674df86a458b098d)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/arm/videodsp_armv5te.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/arm/videodsp_armv5te.S b/libavcodec/arm/videodsp_armv5te.S index 55bcce5cb6..aff1161ada 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 |