[vlc-devel] [PATCH 9/19] deinterlace: purge MMX/MMXEXT

Lyndon Brown jnqnfe at gmail.com
Thu Sep 24 21:38:38 CEST 2020


From: Lyndon Brown <jnqnfe at gmail.com>
Date: Fri, 25 Jan 2019 23:43:28 +0000
Subject: deinterlace: purge MMX/MMXEXT

notes:
 - the whole of mmx.h was removed, despite actually also containing 3dNow
   and SSE items, because none of those are in use
 - the `EndMMX` function of merge.[h|c] has been left, because it is used
   by the SSE2 code (incorrectly?) in deinterlace.c

diff --git a/modules/video_filter/Makefile.am b/modules/video_filter/Makefile.am
index 7a51d960eb..50a06c9334 100644
--- a/modules/video_filter/Makefile.am
+++ b/modules/video_filter/Makefile.am
@@ -127,7 +127,6 @@ noinst_LTLIBRARIES += libdeinterlace_common.la
 
 libdeinterlace_plugin_la_SOURCES = \
 	video_filter/deinterlace/deinterlace.c video_filter/deinterlace/deinterlace.h \
-        video_filter/deinterlace/mmx.h \
 	video_filter/deinterlace/merge.c video_filter/deinterlace/merge.h \
 	video_filter/deinterlace/helpers.c video_filter/deinterlace/helpers.h \
 	video_filter/deinterlace/algo_basic.c video_filter/deinterlace/algo_basic.h \
diff --git a/modules/video_filter/deinterlace/algo_ivtc.c b/modules/video_filter/deinterlace/algo_ivtc.c
index 2e6d09b69d..a10dbd9cf8 100644
--- a/modules/video_filter/deinterlace/algo_ivtc.c
+++ b/modules/video_filter/deinterlace/algo_ivtc.c
@@ -24,10 +24,6 @@
 #   include "config.h"
 #endif
 
-#ifdef CAN_COMPILE_MMXEXT
-#   include "mmx.h"
-#endif
-
 #include <stdint.h>
 #include <assert.h>
 
diff --git a/modules/video_filter/deinterlace/algo_yadif.c b/modules/video_filter/deinterlace/algo_yadif.c
index 6fdecf53a5..1e60b30013 100644
--- a/modules/video_filter/deinterlace/algo_yadif.c
+++ b/modules/video_filter/deinterlace/algo_yadif.c
@@ -119,11 +119,6 @@ int RenderYadif( filter_t *p_filter, picture_t *p_dst, picture_t *p_src,
         if( vlc_CPU_SSE2() )
             filter = vlcpriv_yadif_filter_line_sse2;
         else
-#if defined(__i386__)
-        if( vlc_CPU_MMXEXT() )
-            filter = vlcpriv_yadif_filter_line_mmxext;
-        else
-#endif
 #endif
             filter = yadif_filter_line_c;
 
diff --git a/modules/video_filter/deinterlace/deinterlace.c b/modules/video_filter/deinterlace/deinterlace.c
index 1676a07f8c..0f59fa16f7 100644
--- a/modules/video_filter/deinterlace/deinterlace.c
+++ b/modules/video_filter/deinterlace/deinterlace.c
@@ -548,14 +548,6 @@ notsupp:
     }
     else
 #endif
-#if defined(CAN_COMPILE_MMXEXT)
-    if( pixel_size == 1 && vlc_CPU_MMXEXT() )
-    {
-        p_sys->pf_merge = MergeMMXEXT;
-        p_sys->pf_end_merge = EndMMX;
-    }
-    else
-#endif
 #if defined(CAN_COMPILE_3DNOW)
     if( pixel_size == 1 && vlc_CPU_3dNOW() )
     {
diff --git a/modules/video_filter/deinterlace/deinterlace.h b/modules/video_filter/deinterlace/deinterlace.h
index 959cd6ae96..74fbbc9f63 100644
--- a/modules/video_filter/deinterlace/deinterlace.h
+++ b/modules/video_filter/deinterlace/deinterlace.h
@@ -68,7 +68,7 @@ typedef struct
 {
     const vlc_chroma_description_t *chroma;
 
-    /** Merge routine: C, MMX, SSE, ALTIVEC, NEON, ... */
+    /** Merge routine: C, SSE, ALTIVEC, NEON, ... */
     void (*pf_merge) ( void *, const void *, const void *, size_t );
 #if defined (__i386__) || defined (__x86_64__)
     /** Merge finalization routine for SSE */
diff --git a/modules/video_filter/deinterlace/merge.c b/modules/video_filter/deinterlace/merge.c
index 8d36479ca1..ec6bbe7254 100644
--- a/modules/video_filter/deinterlace/merge.c
+++ b/modules/video_filter/deinterlace/merge.c
@@ -33,10 +33,6 @@
 #include <vlc_cpu.h>
 #include "merge.h"
 
-#ifdef CAN_COMPILE_MMXEXT
-#   include "mmx.h"
-#endif
-
 #ifdef HAVE_ALTIVEC_H
 #   include <altivec.h>
 #endif
@@ -67,32 +63,6 @@ void Merge16BitGeneric( void *_p_dest, const void *_p_s1,
         *p_dest++ = ( *p_s1++ + *p_s2++ ) >> 1;
 }
 
-#if defined(CAN_COMPILE_MMXEXT)
-VLC_MMX
-void MergeMMXEXT( void *_p_dest, const void *_p_s1, const void *_p_s2,
-                  size_t i_bytes )
-{
-    uint8_t *p_dest = _p_dest;
-    const uint8_t *p_s1 = _p_s1;
-    const uint8_t *p_s2 = _p_s2;
-
-    for( ; i_bytes >= 8; i_bytes -= 8 )
-    {
-        __asm__  __volatile__( "movq %2,%%mm1;"
-                               "pavgb %1, %%mm1;"
-                               "movq %%mm1, %0" :"=m" (*p_dest):
-                                                 "m" (*p_s1),
-                                                 "m" (*p_s2) : "mm1" );
-        p_dest += 8;
-        p_s1 += 8;
-        p_s2 += 8;
-    }
-
-    for( ; i_bytes > 0; i_bytes-- )
-        *p_dest++ = ( *p_s1++ + *p_s2++ ) >> 1;
-}
-#endif
-
 #if defined(CAN_COMPILE_3DNOW)
 VLC_MMX
 void Merge3DNow( void *_p_dest, const void *_p_s1, const void *_p_s2,
@@ -249,7 +219,7 @@ void MergeAltivec( void *_p_dest, const void *_p_s1,
  * EndMerge routines
  *****************************************************************************/
 
-#if defined(CAN_COMPILE_MMXEXT) || defined(CAN_COMPILE_SSE)
+#if defined(CAN_COMPILE_SSE)
 void EndMMX( void )
 {
     __asm__ __volatile__( "emms" :: );
diff --git a/modules/video_filter/deinterlace/merge.h b/modules/video_filter/deinterlace/merge.h
index 26a03fee1f..6143d397cb 100644
--- a/modules/video_filter/deinterlace/merge.h
+++ b/modules/video_filter/deinterlace/merge.h
@@ -112,18 +112,6 @@ void Merge16BitGeneric( void *_p_dest, const void *_p_s1, const void *_p_s2,
 void MergeAltivec ( void *, const void *, const void *, size_t );
 #endif
 
-#if defined(CAN_COMPILE_MMXEXT)
-/**
- * MMXEXT routine to blend pixels from two picture lines.
- *
- * @param _p_dest Target
- * @param _p_s1 Source line A
- * @param _p_s2 Source line B
- * @param i_bytes Number of bytes to merge
- */
-void MergeMMXEXT  ( void *, const void *, const void *, size_t );
-#endif
-
 #if defined(CAN_COMPILE_3DNOW)
 /**
  * 3DNow routine to blend pixels from two picture lines.
@@ -187,7 +175,7 @@ void merge16_arm_sve(void *, const void *, const void *, size_t);
  * EndMerge routines
  *****************************************************************************/
 
-#if defined(CAN_COMPILE_MMXEXT) || defined(CAN_COMPILE_SSE)
+#if defined(CAN_COMPILE_SSE)
 /**
  * MMX merge finalization routine.
  *
diff --git a/modules/video_filter/deinterlace/mmx.h b/modules/video_filter/deinterlace/mmx.h
deleted file mode 100644
index 072efe53c1..0000000000
--- a/modules/video_filter/deinterlace/mmx.h
+++ /dev/null
@@ -1,262 +0,0 @@
-/*
- * mmx.h
- * Copyright (C) 1997-1999 H. Dietz and R. Fisher
- *
- * This file is part of mpeg2dec, a free MPEG-2 video stream decoder.
- *
- * mpeg2dec is free software; you can redistribute it and/or modify
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
- *
- * mpeg2dec is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-/*
- * The type of an value that fits in an MMX register (note that long
- * long constant values MUST be suffixed by LL and unsigned long long
- * values by ULL, lest they be truncated by the compiler)
- */
-
-#include <stdint.h>
-
-typedef    union {
-    int64_t          q;    /* Quadword (64-bit) value */
-    uint64_t        uq;    /* Unsigned Quadword */
-    int32_t          d[2]; /* 2 Doubleword (32-bit) values */
-    uint32_t        ud[2]; /* 2 Unsigned Doubleword */
-    int16_t          w[4]; /* 4 Word (16-bit) values */
-    uint16_t        uw[4]; /* 4 Unsigned Word */
-    int8_t           b[8]; /* 8 Byte (8-bit) values */
-    uint8_t         ub[8]; /* 8 Unsigned Byte */
-    float            s[2]; /* Single-precision (32-bit) value */
-} mmx_t; /* NOTE: must be on an 8-byte (64-bit) boundary */
-
-
-#define    mmx_i2r(op,imm,reg) \
-    __asm__ __volatile__ (#op " %0, %%" #reg \
-                  : /* nothing */ \
-                  : "i" (imm) \
-                  : #reg)
-
-#define    mmx_m2r(op,mem,reg) \
-    __asm__ __volatile__ (#op " %0, %%" #reg \
-                  : /* nothing */ \
-                  : "m" (mem) \
-                  : #reg)
-
-#define    mmx_r2m(op,reg,mem) \
-    __asm__ __volatile__ (#op " %%" #reg ", %0" \
-                  : "=m" (mem) \
-                  : /* nothing */ \
-                  : "memory")
-
-#define    mmx_r2r(op,regs,regd) \
-    __asm__ __volatile__ (#op " %%" #regs ", %%" #regd ::: #regd)
-
-
-#define    emms() __asm__ __volatile__ ("emms")
-
-#define    movd_m2r(var,reg)    mmx_m2r (movd, var, reg)
-#define    movd_r2m(reg,var)    mmx_r2m (movd, reg, var)
-#define    movd_r2r(regs,regd)    mmx_r2r (movd, regs, regd)
-
-#define    movq_m2r(var,reg)    mmx_m2r (movq, var, reg)
-#define    movq_r2m(reg,var)    mmx_r2m (movq, reg, var)
-#define    movq_r2r(regs,regd)    mmx_r2r (movq, regs, regd)
-
-#define    packssdw_m2r(var,reg)    mmx_m2r (packssdw, var, reg)
-#define    packssdw_r2r(regs,regd) mmx_r2r (packssdw, regs, regd)
-#define    packsswb_m2r(var,reg)    mmx_m2r (packsswb, var, reg)
-#define    packsswb_r2r(regs,regd) mmx_r2r (packsswb, regs, regd)
-
-#define    packuswb_m2r(var,reg)    mmx_m2r (packuswb, var, reg)
-#define    packuswb_r2r(regs,regd) mmx_r2r (packuswb, regs, regd)
-
-#define    paddb_m2r(var,reg)    mmx_m2r (paddb, var, reg)
-#define    paddb_r2r(regs,regd)    mmx_r2r (paddb, regs, regd)
-#define    paddd_m2r(var,reg)    mmx_m2r (paddd, var, reg)
-#define    paddd_r2r(regs,regd)    mmx_r2r (paddd, regs, regd)
-#define    paddw_m2r(var,reg)    mmx_m2r (paddw, var, reg)
-#define    paddw_r2r(regs,regd)    mmx_r2r (paddw, regs, regd)
-
-#define    paddsb_m2r(var,reg)    mmx_m2r (paddsb, var, reg)
-#define    paddsb_r2r(regs,regd)    mmx_r2r (paddsb, regs, regd)
-#define    paddsw_m2r(var,reg)    mmx_m2r (paddsw, var, reg)
-#define    paddsw_r2r(regs,regd)    mmx_r2r (paddsw, regs, regd)
-
-#define    paddusb_m2r(var,reg)    mmx_m2r (paddusb, var, reg)
-#define    paddusb_r2r(regs,regd)    mmx_r2r (paddusb, regs, regd)
-#define    paddusw_m2r(var,reg)    mmx_m2r (paddusw, var, reg)
-#define    paddusw_r2r(regs,regd)    mmx_r2r (paddusw, regs, regd)
-
-#define    pand_m2r(var,reg)    mmx_m2r (pand, var, reg)
-#define    pand_r2r(regs,regd)    mmx_r2r (pand, regs, regd)
-
-#define    pandn_m2r(var,reg)    mmx_m2r (pandn, var, reg)
-#define    pandn_r2r(regs,regd)    mmx_r2r (pandn, regs, regd)
-
-#define    pcmpeqb_m2r(var,reg)    mmx_m2r (pcmpeqb, var, reg)
-#define    pcmpeqb_r2r(regs,regd)    mmx_r2r (pcmpeqb, regs, regd)
-#define    pcmpeqd_m2r(var,reg)    mmx_m2r (pcmpeqd, var, reg)
-#define    pcmpeqd_r2r(regs,regd)    mmx_r2r (pcmpeqd, regs, regd)
-#define    pcmpeqw_m2r(var,reg)    mmx_m2r (pcmpeqw, var, reg)
-#define    pcmpeqw_r2r(regs,regd)    mmx_r2r (pcmpeqw, regs, regd)
-
-#define    pcmpgtb_m2r(var,reg)    mmx_m2r (pcmpgtb, var, reg)
-#define    pcmpgtb_r2r(regs,regd)    mmx_r2r (pcmpgtb, regs, regd)
-#define    pcmpgtd_m2r(var,reg)    mmx_m2r (pcmpgtd, var, reg)
-#define    pcmpgtd_r2r(regs,regd)    mmx_r2r (pcmpgtd, regs, regd)
-#define    pcmpgtw_m2r(var,reg)    mmx_m2r (pcmpgtw, var, reg)
-#define    pcmpgtw_r2r(regs,regd)    mmx_r2r (pcmpgtw, regs, regd)
-
-#define    pmaddwd_m2r(var,reg)    mmx_m2r (pmaddwd, var, reg)
-#define    pmaddwd_r2r(regs,regd)    mmx_r2r (pmaddwd, regs, regd)
-
-#define    pmulhw_m2r(var,reg)    mmx_m2r (pmulhw, var, reg)
-#define    pmulhw_r2r(regs,regd)    mmx_r2r (pmulhw, regs, regd)
-
-#define    pmullw_m2r(var,reg)    mmx_m2r (pmullw, var, reg)
-#define    pmullw_r2r(regs,regd)    mmx_r2r (pmullw, regs, regd)
-
-#define    por_m2r(var,reg)    mmx_m2r (por, var, reg)
-#define    por_r2r(regs,regd)    mmx_r2r (por, regs, regd)
-
-#define    pslld_i2r(imm,reg)    mmx_i2r (pslld, imm, reg)
-#define    pslld_m2r(var,reg)    mmx_m2r (pslld, var, reg)
-#define    pslld_r2r(regs,regd)    mmx_r2r (pslld, regs, regd)
-#define    psllq_i2r(imm,reg)    mmx_i2r (psllq, imm, reg)
-#define    psllq_m2r(var,reg)    mmx_m2r (psllq, var, reg)
-#define    psllq_r2r(regs,regd)    mmx_r2r (psllq, regs, regd)
-#define    psllw_i2r(imm,reg)    mmx_i2r (psllw, imm, reg)
-#define    psllw_m2r(var,reg)    mmx_m2r (psllw, var, reg)
-#define    psllw_r2r(regs,regd)    mmx_r2r (psllw, regs, regd)
-
-#define    psrad_i2r(imm,reg)    mmx_i2r (psrad, imm, reg)
-#define    psrad_m2r(var,reg)    mmx_m2r (psrad, var, reg)
-#define    psrad_r2r(regs,regd)    mmx_r2r (psrad, regs, regd)
-#define    psraw_i2r(imm,reg)    mmx_i2r (psraw, imm, reg)
-#define    psraw_m2r(var,reg)    mmx_m2r (psraw, var, reg)
-#define    psraw_r2r(regs,regd)    mmx_r2r (psraw, regs, regd)
-
-#define    psrld_i2r(imm,reg)    mmx_i2r (psrld, imm, reg)
-#define    psrld_m2r(var,reg)    mmx_m2r (psrld, var, reg)
-#define    psrld_r2r(regs,regd)    mmx_r2r (psrld, regs, regd)
-#define    psrlq_i2r(imm,reg)    mmx_i2r (psrlq, imm, reg)
-#define    psrlq_m2r(var,reg)    mmx_m2r (psrlq, var, reg)
-#define    psrlq_r2r(regs,regd)    mmx_r2r (psrlq, regs, regd)
-#define    psrlw_i2r(imm,reg)    mmx_i2r (psrlw, imm, reg)
-#define    psrlw_m2r(var,reg)    mmx_m2r (psrlw, var, reg)
-#define    psrlw_r2r(regs,regd)    mmx_r2r (psrlw, regs, regd)
-
-#define    psubb_m2r(var,reg)    mmx_m2r (psubb, var, reg)
-#define    psubb_r2r(regs,regd)    mmx_r2r (psubb, regs, regd)
-#define    psubd_m2r(var,reg)    mmx_m2r (psubd, var, reg)
-#define    psubd_r2r(regs,regd)    mmx_r2r (psubd, regs, regd)
-#define    psubw_m2r(var,reg)    mmx_m2r (psubw, var, reg)
-#define    psubw_r2r(regs,regd)    mmx_r2r (psubw, regs, regd)
-
-#define    psubsb_m2r(var,reg)    mmx_m2r (psubsb, var, reg)
-#define    psubsb_r2r(regs,regd)    mmx_r2r (psubsb, regs, regd)
-#define    psubsw_m2r(var,reg)    mmx_m2r (psubsw, var, reg)
-#define    psubsw_r2r(regs,regd)    mmx_r2r (psubsw, regs, regd)
-
-#define    psubusb_m2r(var,reg)    mmx_m2r (psubusb, var, reg)
-#define    psubusb_r2r(regs,regd)    mmx_r2r (psubusb, regs, regd)
-#define    psubusw_m2r(var,reg)    mmx_m2r (psubusw, var, reg)
-#define    psubusw_r2r(regs,regd)    mmx_r2r (psubusw, regs, regd)
-
-#define    punpckhbw_m2r(var,reg)        mmx_m2r (punpckhbw, var, reg)
-#define    punpckhbw_r2r(regs,regd)    mmx_r2r (punpckhbw, regs, regd)
-#define    punpckhdq_m2r(var,reg)        mmx_m2r (punpckhdq, var, reg)
-#define    punpckhdq_r2r(regs,regd)    mmx_r2r (punpckhdq, regs, regd)
-#define    punpckhwd_m2r(var,reg)        mmx_m2r (punpckhwd, var, reg)
-#define    punpckhwd_r2r(regs,regd)    mmx_r2r (punpckhwd, regs, regd)
-
-#define    punpcklbw_m2r(var,reg)         mmx_m2r (punpcklbw, var, reg)
-#define    punpcklbw_r2r(regs,regd)    mmx_r2r (punpcklbw, regs, regd)
-#define    punpckldq_m2r(var,reg)        mmx_m2r (punpckldq, var, reg)
-#define    punpckldq_r2r(regs,regd)    mmx_r2r (punpckldq, regs, regd)
-#define    punpcklwd_m2r(var,reg)        mmx_m2r (punpcklwd, var, reg)
-#define    punpcklwd_r2r(regs,regd)    mmx_r2r (punpcklwd, regs, regd)
-
-#define    pxor_m2r(var,reg)    mmx_m2r (pxor, var, reg)
-#define    pxor_r2r(regs,regd)    mmx_r2r (pxor, regs, regd)
-
-
-/* 3DNOW extensions */
-
-#define pavgusb_m2r(var,reg)    mmx_m2r (pavgusb, var, reg)
-#define pavgusb_r2r(regs,regd)    mmx_r2r (pavgusb, regs, regd)
-
-
-/* AMD MMX extensions - also available in intel SSE */
-
-
-#define mmx_m2ri(op,mem,reg,imm) \
-        __asm__ __volatile__ (#op " %1, %0, %%" #reg \
-                              : /* nothing */ \
-                              : "X" (mem), "X" (imm) \
-                              : #reg)
-#define mmx_r2ri(op,regs,regd,imm) \
-        __asm__ __volatile__ (#op " %0, %%" #regs ", %%" #regd \
-                              : /* nothing */ \
-                              : "X" (imm) \
-                              : #regd)
-
-#define    mmx_fetch(mem,hint) \
-    __asm__ __volatile__ ("prefetch" #hint " %0" \
-                  : /* nothing */ \
-                  : "X" (mem))
-
-
-#define    maskmovq(regs,maskreg)        mmx_r2ri (maskmovq, regs, maskreg)
-
-#define    movntq_r2m(mmreg,var)        mmx_r2m (movntq, mmreg, var)
-
-#define    pavgb_m2r(var,reg)        mmx_m2r (pavgb, var, reg)
-#define    pavgb_r2r(regs,regd)        mmx_r2r (pavgb, regs, regd)
-#define    pavgw_m2r(var,reg)        mmx_m2r (pavgw, var, reg)
-#define    pavgw_r2r(regs,regd)        mmx_r2r (pavgw, regs, regd)
-
-#define    pextrw_r2r(mmreg,reg,imm)    mmx_r2ri (pextrw, mmreg, reg, imm)
-
-#define    pinsrw_r2r(reg,mmreg,imm)    mmx_r2ri (pinsrw, reg, mmreg, imm)
-
-#define    pmaxsw_m2r(var,reg)        mmx_m2r (pmaxsw, var, reg)
-#define    pmaxsw_r2r(regs,regd)        mmx_r2r (pmaxsw, regs, regd)
-
-#define    pmaxub_m2r(var,reg)        mmx_m2r (pmaxub, var, reg)
-#define    pmaxub_r2r(regs,regd)        mmx_r2r (pmaxub, regs, regd)
-
-#define    pminsw_m2r(var,reg)        mmx_m2r (pminsw, var, reg)
-#define    pminsw_r2r(regs,regd)        mmx_r2r (pminsw, regs, regd)
-
-#define    pminub_m2r(var,reg)        mmx_m2r (pminub, var, reg)
-#define    pminub_r2r(regs,regd)        mmx_r2r (pminub, regs, regd)
-
-#define    pmovmskb(mmreg,reg) \
-    __asm__ __volatile__ ("movmskps %" #mmreg ", %" #reg : : : #reg)
-
-#define    pmulhuw_m2r(var,reg)        mmx_m2r (pmulhuw, var, reg)
-#define    pmulhuw_r2r(regs,regd)        mmx_r2r (pmulhuw, regs, regd)
-
-#define    prefetcht0(mem)            mmx_fetch (mem, t0)
-#define    prefetcht1(mem)            mmx_fetch (mem, t1)
-#define    prefetcht2(mem)            mmx_fetch (mem, t2)
-#define    prefetchnta(mem)        mmx_fetch (mem, nta)
-
-#define    psadbw_m2r(var,reg)        mmx_m2r (psadbw, var, reg)
-#define    psadbw_r2r(regs,regd)        mmx_r2r (psadbw, regs, regd)
-
-#define    pshufw_m2r(var,reg,imm)        mmx_m2ri(pshufw, var, reg, imm)
-#define    pshufw_r2r(regs,regd,imm)    mmx_r2ri(pshufw, regs, regd, imm)
-
-#define    sfence() __asm__ __volatile__ ("sfence\n\t")
diff --git a/modules/video_filter/deinterlace/yadif.h b/modules/video_filter/deinterlace/yadif.h
index f520c20252..fe8d4bfc07 100644
--- a/modules/video_filter/deinterlace/yadif.h
+++ b/modules/video_filter/deinterlace/yadif.h
@@ -97,6 +97,3 @@ static void yadif_filter_line_c_16bit(uint8_t *dst8, uint8_t *prev8, uint8_t *cu
 void vlcpriv_yadif_filter_line_ssse3(uint8_t *dst, uint8_t *prev, uint8_t *cur, uint8_t *next, int w, int prefs, int mrefs, int parity, int mode);
 void vlcpriv_yadif_filter_line_sse2(uint8_t *dst, uint8_t *prev, uint8_t *cur, uint8_t *next, int w, int prefs, int mrefs, int parity, int mode);
 #endif
-#if defined(__i386__)
-void vlcpriv_yadif_filter_line_mmxext(uint8_t *dst, uint8_t *prev, uint8_t *cur, uint8_t *next, int w, int prefs, int mrefs, int parity, int mode);
-#endif
diff --git a/modules/video_filter/deinterlace/yadif_x86.asm b/modules/video_filter/deinterlace/yadif_x86.asm
index a3661afa2e..bf4da9bbcc 100644
--- a/modules/video_filter/deinterlace/yadif_x86.asm
+++ b/modules/video_filter/deinterlace/yadif_x86.asm
@@ -248,9 +248,6 @@ cglobal yadif_filter_line, 4, 7, 8,  80, dst, prev, cur, next, w, prefs, \
     FILTER 0, curq, nextq
 
 .ret:
-%if mmsize == 8
-    emms
-%endif
     RET
 %if ARCH_X86_32
   %undef pb_1
@@ -262,7 +259,3 @@ INIT_XMM ssse3
 YADIF
 INIT_XMM sse2
 YADIF
-%if ARCH_X86_32
-INIT_MMX mmxext
-YADIF
-%endif



More information about the vlc-devel mailing list