diff options
author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-11-17 15:05:07 +0100 |
---|---|---|
committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-11-17 15:05:07 +0100 |
commit | 2818aaaba09da380639a1ed51e4f3ece8cb3b2ec (patch) | |
tree | 00fb0a579a88c7abc60abb026f801201cd0eecbe /libavcodec | |
parent | 711b7b77763cd55d5584ae82ce5cae6d4718092d (diff) | |
parent | 5f74bd31a9bd1ac7655103b11743c12d38e0419f (diff) | |
download | ffmpeg-2818aaaba09da380639a1ed51e4f3ece8cb3b2ec.tar.gz |
Merge commit '5f74bd31a9bd1ac7655103b11743c12d38e0419f'
* commit '5f74bd31a9bd1ac7655103b11743c12d38e0419f':
vp8/armv6: mc: avoid boolean expression in calculation
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/arm/vp8dsp_armv6.S | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/libavcodec/arm/vp8dsp_armv6.S b/libavcodec/arm/vp8dsp_armv6.S index f1ec6eeb96..adecd1ce93 100644 --- a/libavcodec/arm/vp8dsp_armv6.S +++ b/libavcodec/arm/vp8dsp_armv6.S @@ -1226,13 +1226,8 @@ vp8_mc_1 bilin, 8, v vp8_mc_1 bilin, 4, h vp8_mc_1 bilin, 4, v -/* True relational expressions have the value -1 in the GNU assembler, - +1 in Apple's. */ -#ifdef __APPLE__ -# define TMPSIZE \size * (8 + 8*(\size > 4) + \ytaps - 1) -#else -# define TMPSIZE \size * (8 - 8*(\size > 4) + \ytaps - 1) -#endif +@ 4 and 8 pixel wide mc blocks might have height of 8 or 16 lines +#define TMPSIZE \size * (16 / ((16 / \size + 1) / 2) + \ytaps - 1) .macro vp8_mc_hv name, size, h, v, ytaps function ff_put_vp8_\name\size\()_\h\v\()_armv6, export=1 |