[FFmpeg-cvslog] avcodec/x86/deinterlace: use INIT_MMX like other asm code does too
Michael Niedermayer
git at videolan.org
Tue May 5 03:40:42 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue May 5 02:19:30 2015 +0200| [6ef3426d90a316d710476326aa863b1c56f9c2a0] | committer: Michael Niedermayer
avcodec/x86/deinterlace: use INIT_MMX like other asm code does too
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6ef3426d90a316d710476326aa863b1c56f9c2a0
---
libavcodec/x86/deinterlace.asm | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/libavcodec/x86/deinterlace.asm b/libavcodec/x86/deinterlace.asm
index baa9249..c421385 100644
--- a/libavcodec/x86/deinterlace.asm
+++ b/libavcodec/x86/deinterlace.asm
@@ -31,10 +31,10 @@ SECTION .text
%macro DEINTERLACE 1
%ifidn %1, inplace
;void ff_deinterlace_line_inplace_mmx(const uint8_t *lum_m4, const uint8_t *lum_m3, const uint8_t *lum_m2, const uint8_t *lum_m1, const uint8_t *lum, int size)
-cglobal deinterlace_line_inplace_mmx, 6,6,7, lum_m4, lum_m3, lum_m2, lum_m1, lum, size
+cglobal deinterlace_line_inplace, 6,6,7, lum_m4, lum_m3, lum_m2, lum_m1, lum, size
%else
;void ff_deinterlace_line_mmx(uint8_t *dst, const uint8_t *lum_m4, const uint8_t *lum_m3, const uint8_t *lum_m2, const uint8_t *lum_m1, const uint8_t *lum, int size)
-cglobal deinterlace_line_mmx, 7,7,7, dst, lum_m4, lum_m3, lum_m2, lum_m1, lum, size
+cglobal deinterlace_line, 7,7,7, dst, lum_m4, lum_m3, lum_m2, lum_m1, lum, size
%endif
pxor mm7, mm7
movq mm6, [pw_4]
@@ -77,6 +77,8 @@ cglobal deinterlace_line_mmx, 7,7,7, dst, lum_m4, lum_m3, lum_m2, lum_m1
REP_RET
%endmacro
+INIT_MMX mmx
+
DEINTERLACE ""
DEINTERLACE inplace
More information about the ffmpeg-cvslog
mailing list