* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "asm.S"
+#include "libavutil/arm/asm.S"
@ idct
usub16 r4, r4, r6 @ block[0,1][3]
usub16 r5, r5, r12 @ block[2,3][3]
-#if HAVE_ARMV6T2
+#if HAVE_ARMV6T2_EXTERNAL
sbfx r6, r8, #3, #13
sbfx r12, r7, #3, #13
sbfx r1, r9, #3, #13
strh r4, [r0], #32
asr r10, r5, #19 @ block[3][3]
-#if HAVE_ARMV6T2
+#if HAVE_ARMV6T2_EXTERNAL
sbfx r2, r2, #3, #13
sbfx lr, lr, #3, #13
sbfx r3, r3, #3, #13
sxth r12, r12
ldr r9, [r0, r2]
sxth r1, r1
-#if HAVE_ARMV6T2
+#if HAVE_ARMV6T2_EXTERNAL
sbfx r7, r7, #3, #13
sbfx r10, r10, #3, #13
#else
b vp8_h_loop_filter_armv6
endfunc
+.ltorg
+
@ MC
@ void put_vp8_pixels16(uint8_t *dst, int dststride, uint8_t *src,
vp8_mc_1 bilin, 4, h
vp8_mc_1 bilin, 4, v
-#define TMPSIZE \size * (8 - 8*(\size > 4) + \ytaps - 1)
+/* 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
.macro vp8_mc_hv name, size, h, v, ytaps
function ff_put_vp8_\name\size\()_\h\v\()_armv6, export=1