diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-12 16:35:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-17 19:43:19 +0100 |
| commit | 2dca276dcb9ce6af4eb8a7d23fc234e944f015d8 (patch) | |
| tree | 199db51f976d28ebf305a1011f798f2f31754374 /libavcodec | |
| parent | 0ee5f46fd1d1d25c0a98d8da8dd338a90db4a603 (diff) | |
| download | ffmpeg-2dca276dcb9ce6af4eb8a7d23fc234e944f015d8.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>
Diffstat (limited to 'libavcodec')
| -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 4bd365a332..24bdc3ee15 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 |