diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-21 17:18:43 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-21 17:18:43 +0100 |
| commit | a41bf09d9c56215448f14fb086c9f882eb41ecac (patch) | |
| tree | 541da01619d95763ff0ee46ae0df50125505b3c4 /libavcodec/arm/dsputil_arm.S | |
| parent | fb3f28ee289b9ea5106d5a7fa00a1018eb379e65 (diff) | |
| parent | 6906b19346ae8a330bfaa1c16ce535be10789723 (diff) | |
| download | ffmpeg-a41bf09d9c56215448f14fb086c9f882eb41ecac.tar.gz | |
Merge commit '6906b19346ae8a330bfaa1c16ce535be10789723'
* commit '6906b19346ae8a330bfaa1c16ce535be10789723':
lavc: add missing files for arm
lavc: introduce VideoDSPContext
Conflicts:
configure
libavcodec/arm/dsputil_init_armv5te.c
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/dsputil_template.c
libavcodec/h264.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/x86/dsputil_mmx.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/dsputil_arm.S')
| -rw-r--r-- | libavcodec/arm/dsputil_arm.S | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/libavcodec/arm/dsputil_arm.S b/libavcodec/arm/dsputil_arm.S index 9c9bd253ee..994b440bff 100644 --- a/libavcodec/arm/dsputil_arm.S +++ b/libavcodec/arm/dsputil_arm.S @@ -22,15 +22,7 @@ #include "config.h" #include "libavutil/arm/asm.S" -#if HAVE_ARMV5TE_EXTERNAL -function ff_prefetch_arm, export=1 - subs r2, r2, #1 - pld [r0] - add r0, r0, r1 - bne ff_prefetch_arm - bx lr -endfunc -#else +#if !HAVE_ARMV5TE_EXTERNAL #define pld @ #endif |