[FFmpeg-cvslog] swscale/arm/yuv2rgb: re-order compute_rgba macro arguments

Matthieu Bouron git at videolan.org
Fri Apr 1 17:29:14 CEST 2016


ffmpeg | branch: master | Matthieu Bouron <matthieu.bouron at gmail.com> | Mon Mar 28 12:24:44 2016 +0000| [339668301e455e3f8b5cba664622d7ccf5237b54] | committer: Matthieu Bouron

swscale/arm/yuv2rgb: re-order compute_rgba macro arguments

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=339668301e455e3f8b5cba664622d7ccf5237b54
---

 libswscale/arm/yuv2rgb_neon.S |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/libswscale/arm/yuv2rgb_neon.S b/libswscale/arm/yuv2rgb_neon.S
index 548b6a8..ee11e08 100644
--- a/libswscale/arm/yuv2rgb_neon.S
+++ b/libswscale/arm/yuv2rgb_neon.S
@@ -56,8 +56,8 @@
     vqrshrun.s16        \dst_comp2, q2, #6
 .endm
 
-.macro compute_rgba r1 r2 g1 g2 b1 b2 a1 a2
-    compute_color       \r1, \r2, q8,  q9
+.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
     vmov.u8             \a1, #255
@@ -80,19 +80,19 @@
 
 
 .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}, [\dst,:128]!
     vst4.8              {q5, q6}, [\dst,:128]!



More information about the ffmpeg-cvslog mailing list