mirror of
https://gitee.com/openharmony/third_party_ffmpeg
synced 2024-11-23 19:30:05 +00:00
Merge commit '5f74bd31a9bd1ac7655103b11743c12d38e0419f'
* commit '5f74bd31a9bd1ac7655103b11743c12d38e0419f': vp8/armv6: mc: avoid boolean expression in calculation Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
commit
2818aaaba0
@ -1226,13 +1226,8 @@ vp8_mc_1 bilin, 8, v
|
|||||||
vp8_mc_1 bilin, 4, h
|
vp8_mc_1 bilin, 4, h
|
||||||
vp8_mc_1 bilin, 4, v
|
vp8_mc_1 bilin, 4, v
|
||||||
|
|
||||||
/* True relational expressions have the value -1 in the GNU assembler,
|
@ 4 and 8 pixel wide mc blocks might have height of 8 or 16 lines
|
||||||
+1 in Apple's. */
|
#define TMPSIZE \size * (16 / ((16 / \size + 1) / 2) + \ytaps - 1)
|
||||||
#ifdef __APPLE__
|
|
||||||
# define TMPSIZE \size * (8 + 8*(\size > 4) + \ytaps - 1)
|
|
||||||
#else
|
|
||||||
# define TMPSIZE \size * (8 - 8*(\size > 4) + \ytaps - 1)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
.macro vp8_mc_hv name, size, h, v, ytaps
|
.macro vp8_mc_hv name, size, h, v, ytaps
|
||||||
function ff_put_vp8_\name\size\()_\h\v\()_armv6, export=1
|
function ff_put_vp8_\name\size\()_\h\v\()_armv6, export=1
|
||||||
|
Loading…
Reference in New Issue
Block a user