[FFmpeg-cvslog] huffyuvencdsp: Cherry pick changes left out in the last commit

Timothy Gu git at videolan.org
Wed Oct 21 21:43:18 CEST 2015


ffmpeg | branch: master | Timothy Gu <timothygu99 at gmail.com> | Mon Oct 19 02:25:11 2015 +0100| [98da061461f5490bd6346869b84a49dc451f57c7] | committer: Timothy Gu

huffyuvencdsp: Cherry pick changes left out in the last commit

Oops.

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

 libavcodec/x86/huffyuvencdsp.asm |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavcodec/x86/huffyuvencdsp.asm b/libavcodec/x86/huffyuvencdsp.asm
index 699fd38..80b8a54 100644
--- a/libavcodec/x86/huffyuvencdsp.asm
+++ b/libavcodec/x86/huffyuvencdsp.asm
@@ -27,8 +27,8 @@
 
 section .text
 
-; void ff_diff_bytes_mmx(uint8_t *dst, const uint8_t *src1, const uint8_t *src2,
-;                        intptr_t w);
+; void ff_diff_bytes(uint8_t *dst, const uint8_t *src1, const uint8_t *src2,
+;                    intptr_t w);
 %macro DIFF_BYTES_PROLOGUE 0
 %if ARCH_X86_32
 cglobal diff_bytes, 3,5,2, dst, src1, src2
@@ -55,7 +55,7 @@ cglobal diff_bytes, 4,5,2, dst, src1, src2, w
 
 ; mov type used for src1q, dstq, first reg, second reg
 %macro DIFF_BYTES_LOOP_CORE 4
-%if regsize != 16
+%if mmsize != 16
     mov%1             %3, [src1q + i]
     mov%1             %4, [src1q + i + regsize]
     psubb             %3, [src2q + i]



More information about the ffmpeg-cvslog mailing list