[FFmpeg-cvslog] Merge commit '014852e932dab6e9cf2a53e7a17ce8321f3e922c'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Sun Mar 19 16:12:07 2017 +0100| [a754fae4a7e1940ed81be54fcc824cd28ed20d2b] | committer: Clément Bœsch

Merge commit '014852e932dab6e9cf2a53e7a17ce8321f3e922c'

* commit '014852e932dab6e9cf2a53e7a17ce8321f3e922c':
  simple_idct: arm: Drop disabled code variant

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

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

 libavcodec/arm/simple_idct_armv5te.S | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/libavcodec/arm/simple_idct_armv5te.S b/libavcodec/arm/simple_idct_armv5te.S
index d1f10b7..a8d0346 100644
--- a/libavcodec/arm/simple_idct_armv5te.S
+++ b/libavcodec/arm/simple_idct_armv5te.S
@@ -148,12 +148,6 @@ endfunc
         ldr    a4, [a1]              /* a4 = col[1:0] */
         mov    ip, #16384
         sub    ip, ip, #1            /* ip = W4 */
-#if 0
-        mov    v1, #(1<<(COL_SHIFT-1))
-        smlabt v2, ip, a4, v1        /* v2 = W4*col[1] + (1<<(COL_SHIFT-1)) */
-        smlabb v1, ip, a4, v1        /* v1 = W4*col[0] + (1<<(COL_SHIFT-1)) */
-        ldr    a4, [a1, #(16*4)]
-#else
         mov    v1, #((1<<(COL_SHIFT-1))/W4) /* this matches the C version */
         add    v2, v1, a4, asr #16
         rsb    v2, v2, v2, lsl #14
@@ -161,7 +155,6 @@ endfunc
         add    v1, v1, a4, asr #16
         ldr    a4, [a1, #(16*4)]
         rsb    v1, v1, v1, lsl #14
-#endif
 
         smulbb lr, ip, a4
         smulbt a3, ip, a4


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