diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-16 14:48:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-16 14:55:00 +0200 |
| commit | e80cbdbc57292a4687339f6a7d30e0dcff42f9e8 (patch) | |
| tree | c71ab556c3aa7a3307a39e24f7250d9645958aa8 /libavutil/arm | |
| parent | 744e4429cf9a2ac5c7c1e4ed8bfbb6f9f09a882a (diff) | |
| parent | 2568646abb6568b1d329f800a046832adc48acd4 (diff) | |
| download | ffmpeg-streaming-e80cbdbc57292a4687339f6a7d30e0dcff42f9e8.zip ffmpeg-streaming-e80cbdbc57292a4687339f6a7d30e0dcff42f9e8.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpegvideo: drop unnecessary arguments to hpel_motion()
mpegvideo: drop 'inline' from some functions
nellymoserdec: drop support for s16 output.
bmpdec: only initialize palette for pal8.
build: Properly remove object files while cleaning
flacdsp: arm optimised lpc filter
compat/vsnprintf: return number of bytes required on truncation.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/arm')
| -rw-r--r-- | libavutil/arm/asm.S | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavutil/arm/asm.S b/libavutil/arm/asm.S index ccb5231..340ee18 100644 --- a/libavutil/arm/asm.S +++ b/libavutil/arm/asm.S @@ -186,6 +186,12 @@ ELF .size \name, . - \name #endif .endm +.macro add_sh rd, rn, rm, sh:vararg +A add \rd, \rn, \rm, \sh +T mov \rm, \rm, \sh +T add \rd, \rn, \rm +.endm + .macro ldr_pre rt, rn, rm:vararg A ldr \rt, [\rn, \rm]! T add \rn, \rn, \rm |
