On Fri, Mar 25, 2016 at 11:46 PM, Matthieu Bouron <matthieu.bou...@gmail.com
> wrote:
> From: Matthieu Bouron <matthieu.bou...@stupeflix.com>
>
> ---
> libswscale/arm/yuv2rgb_neon.S | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
Patch updated (resolve a conflict with the updated version of patch 06/10).
From 41b0ff49706d82ef964faa75888e95d86f69df34 Mon Sep 17 00:00:00 2001
From: Matthieu Bouron <matthieu.bou...@stupeflix.com>
Date: Fri, 25 Mar 2016 15:38:37 +0000
Subject: [PATCH 09/10] swscale/arm/yuv2rgb: re-order arguments of the
compute_rgba macro
---
libswscale/arm/yuv2rgb_neon.S | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/libswscale/arm/yuv2rgb_neon.S b/libswscale/arm/yuv2rgb_neon.S
index 6a15778..4a5ce11 100644
--- a/libswscale/arm/yuv2rgb_neon.S
+++ b/libswscale/arm/yuv2rgb_neon.S
@@ -123,7 +123,7 @@
vqrshrun.s16 \dst_comp2, q2, #6
.endm
-.macro compute_rgba r1 r2 g1 g2 b1 b2 a1 a2
+.macro compute_rgba r1 g1 b1 a1 r2 g2 b2 a2
compute_color \r1, \r2, q8, q9
compute_color \g1, \g2, q10, q11
compute_color \b1, \b2, q12, q13
@@ -178,19 +178,19 @@ function ff_\ifmt\()_to_\ofmt\()_neon, export=1
vmul.s16 q15, q7 @ q15 = (srcY - y_offset) * y_coeff (right)
.ifc \ofmt,argb
- compute_rgba d7, d11, d8, d12, d9, d13, d6, d10
+ compute_rgba d7, d8, d9, d6, d11, d12, d13, d10
.endif
.ifc \ofmt,rgba
- compute_rgba d6, d10, d7, d11, d8, d12, d9, d13
+ compute_rgba d6, d7, d8, d9, d10, d11, d12, d13
.endif
.ifc \ofmt,abgr
- compute_rgba d9, d13, d8, d12, d7, d11, d6, d10
+ compute_rgba d9, d8, d7, d6, d13, d12, d11, d10
.endif
.ifc \ofmt,bgra
- compute_rgba d8, d12, d7, d11, d6, d10, d9, d13
+ compute_rgba d8, d7, d6, d9, d12, d11, d10, d13
.endif
vst4.8 {q3, q4}, [r2,:128]!
--
2.7.4
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
