lineage-rockchip/android_external_ffmpeg
1
0
Fork 0
Code Activity Actions

Merge remote-tracking branch 'qatar/master'

Browse source 
* 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>
This commit is contained in:
Michael Niedermayer 2012-09-16 14:48:45 +02:00
commit e80cbdbc57
10 changed files with 229 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libavutil/arm/asm.S
View file

@ -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