[FFmpeg-cvslog] Merge commit '1d6c76e11febb58738c9647c47079d02b5e10094'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Mon Mar 20 18:41:49 2017 +0100| [072fad7cf536d4d5be69238bd385d42248b28405] | committer: Clément Bœsch

Merge commit '1d6c76e11febb58738c9647c47079d02b5e10094'

* commit '1d6c76e11febb58738c9647c47079d02b5e10094':
  audiodsp/x86: fix ff_vector_clip_int32_sse2

No functionnal changes, only cosmetics. This issue was fixed in
9a9e2f1c8aa4539a261625145e5c1f46a8106ac2.

Merged-by: Clément Bœsch <u at pkh.me>

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

 libavcodec/x86/audiodsp.asm | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/libavcodec/x86/audiodsp.asm b/libavcodec/x86/audiodsp.asm
index 3ffb27f..67a33ff 100644
--- a/libavcodec/x86/audiodsp.asm
+++ b/libavcodec/x86/audiodsp.asm
@@ -78,15 +78,15 @@ cglobal vector_clip_int32%5, 5,5,%1, dst, src, min, max, len
 .loop:
 %assign %%i 0
 %rep %2
-    mova      m0,  [srcq+mmsize*(0+%%i)]
-    mova      m1,  [srcq+mmsize*(1+%%i)]
-    mova      m2,  [srcq+mmsize*(2+%%i)]
-    mova      m3,  [srcq+mmsize*(3+%%i)]
+    mova      m0,  [srcq + mmsize * (0 + %%i)]
+    mova      m1,  [srcq + mmsize * (1 + %%i)]
+    mova      m2,  [srcq + mmsize * (2 + %%i)]
+    mova      m3,  [srcq + mmsize * (3 + %%i)]
 %if %3
-    mova      m7,  [srcq+mmsize*(4+%%i)]
-    mova      m8,  [srcq+mmsize*(5+%%i)]
-    mova      m9,  [srcq+mmsize*(6+%%i)]
-    mova      m10, [srcq+mmsize*(7+%%i)]
+    mova      m7,  [srcq + mmsize * (4 + %%i)]
+    mova      m8,  [srcq + mmsize * (5 + %%i)]
+    mova      m9,  [srcq + mmsize * (6 + %%i)]
+    mova      m10, [srcq + mmsize * (7 + %%i)]
 %endif
     CLIPD  m0,  m4, m5, m6
     CLIPD  m1,  m4, m5, m6
@@ -98,17 +98,17 @@ cglobal vector_clip_int32%5, 5,5,%1, dst, src, min, max, len
     CLIPD  m9,  m4, m5, m6
     CLIPD  m10, m4, m5, m6
 %endif
-    mova  [dstq+mmsize*(0+%%i)], m0
-    mova  [dstq+mmsize*(1+%%i)], m1
-    mova  [dstq+mmsize*(2+%%i)], m2
-    mova  [dstq+mmsize*(3+%%i)], m3
+    mova  [dstq + mmsize * (0 + %%i)], m0
+    mova  [dstq + mmsize * (1 + %%i)], m1
+    mova  [dstq + mmsize * (2 + %%i)], m2
+    mova  [dstq + mmsize * (3 + %%i)], m3
 %if %3
-    mova  [dstq+mmsize*(4+%%i)], m7
-    mova  [dstq+mmsize*(5+%%i)], m8
-    mova  [dstq+mmsize*(6+%%i)], m9
-    mova  [dstq+mmsize*(7+%%i)], m10
+    mova  [dstq + mmsize * (4 + %%i)], m7
+    mova  [dstq + mmsize * (5 + %%i)], m8
+    mova  [dstq + mmsize * (6 + %%i)], m9
+    mova  [dstq + mmsize * (7 + %%i)], m10
 %endif
-%assign %%i %%i+4*(%3+1)
+%assign %%i (%%i + 4 * (1 + %3))
 %endrep
     add     srcq, mmsize*4*(%2+%3)
     add     dstq, mmsize*4*(%2+%3)


======================================================================