From 1dddd5371a6a60525e9c9c4f5e2534456f84b9d6 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 17 Dec 2015 21:14:45 +0100 Subject: [PATCH] Revert "avcodec/aarch64/neon.S: Update neon.s for transpose_4x4H" The change was not correct and broke H264 This reverts commit cd83f899c94f691b045697d12efa21f83eb2329f. (cherry picked from commit 95b59bfb9d9e47de8438183a035e02667946f27c) Signed-off-by: Michael Niedermayer --- libavcodec/aarch64/neon.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/aarch64/neon.S b/libavcodec/aarch64/neon.S index a227cbd3f64b7..619aec64269c2 100644 --- a/libavcodec/aarch64/neon.S +++ b/libavcodec/aarch64/neon.S @@ -107,8 +107,8 @@ .macro transpose_4x4H r0, r1, r2, r3, r4, r5, r6, r7 trn1 \r4\().4H, \r0\().4H, \r1\().4H trn2 \r5\().4H, \r0\().4H, \r1\().4H - trn1 \r7\().4H, \r2\().4H, \r3\().4H - trn2 \r6\().4H, \r2\().4H, \r3\().4H + trn1 \r7\().4H, \r3\().4H, \r2\().4H + trn2 \r6\().4H, \r3\().4H, \r2\().4H trn1 \r0\().2S, \r4\().2S, \r7\().2S trn2 \r3\().2S, \r4\().2S, \r7\().2S trn1 \r1\().2S, \r5\().2S, \r6\().2S