diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 13:38:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-21 13:38:57 +0100 |
| commit | a85311ef841b87ddaacf7c198f422db5c1ac2d60 (patch) | |
| tree | 0c39d27f14ae7168bbc36f57d049a964c6e63a12 /libavcodec/arm | |
| parent | 098d3891be08ca119e20ad7989668ddef83b31ea (diff) | |
| parent | 68f18f03519ae550e25cf12661172641e9f0eaca (diff) | |
Merge commit '68f18f03519ae550e25cf12661172641e9f0eaca'
* commit '68f18f03519ae550e25cf12661172641e9f0eaca':
videodsp_armv5te: remove #if HAVE_ARMV5TE_EXTERNAL
dsputil: drop non-compliant "fast" qpel mc functions
get_bits: change the failure condition in init_get_bits
Conflicts:
libavcodec/get_bits.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm')
| -rw-r--r-- | libavcodec/arm/videodsp_armv5te.S | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/arm/videodsp_armv5te.S b/libavcodec/arm/videodsp_armv5te.S index c3cd459764..48a6c3ba83 100644 --- a/libavcodec/arm/videodsp_armv5te.S +++ b/libavcodec/arm/videodsp_armv5te.S @@ -22,7 +22,6 @@ #include "config.h" #include "libavutil/arm/asm.S" -#if HAVE_ARMV5TE_EXTERNAL function ff_prefetch_arm, export=1 subs r2, r2, #1 pld [r0] @@ -30,4 +29,3 @@ function ff_prefetch_arm, export=1 bne ff_prefetch_arm bx lr endfunc -#endif |