mmx: merge back into video_chroma (refs #9367)

diff --git a/configure.ac b/configure.ac
index b4cc0bd254b42f64a23918bcf3f28fb2f0d9f88c..969f0a326d2f6fedf2731644cc7d81fd12a253f5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4277,7 +4277,6 @@ AC_CONFIG_FILES([
   modules/video_output/Makefile
   modules/video_splitter/Makefile
   modules/visualization/Makefile
-  modules/mmx/Makefile
   modules/sse2/Makefile
   modules/altivec/Makefile
   modules/arm_neon/Makefile

diff --git a/modules/Makefile.am b/modules/Makefile.am
index 82d0cbdef2fd3bf93ac852a912fb3343d79073c1..2b425aee65073d399876107b87b1187245e0140c 100644 (file)
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -24,7 +24,6 @@ EXTRA_SUBDIRS = \
        access_output \
        mux \
        stream_out \
-       mmx \
        sse2 \
        altivec \
        arm_neon \
@@ -36,9 +35,6 @@ DIST_SUBDIRS = . $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
 if ENABLE_SOUT
 SUBDIRS += access_output mux stream_out
 endif
-if HAVE_MMX
-SUBDIRS += mmx
-endif
 if HAVE_SSE2
 SUBDIRS += sse2
 endif

diff --git a/modules/mmx/Makefile.am b/modules/mmx/Makefile.am
deleted file mode 100644 (file)
index 8635922..0000000
--- a/modules/mmx/Makefile.am
+++ /dev/null
@@ -1,37 +0,0 @@
-AUTOMAKE_OPTIONS = subdir-objects
-basedir = mmx
-include $(top_srcdir)/modules/common.am
-
-libi420_rgb_mmx_plugin_la_SOURCES = \
-        ../video_chroma/i420_rgb.c \
-       ../video_chroma/i420_rgb.h \
-        ../video_chroma/i420_rgb16.c \
-        i420_rgb_mmx.h
-libi420_rgb_mmx_plugin_la_CFLAGS = $(AM_CFLAGS)
-libi420_rgb_mmx_plugin_la_LIBADD = $(AM_LIBADD)
-if HAVE_WIN32
-libi420_rgb_mmx_plugin_la_DEPENDENCIES = libi420_rgb_mmx_plugin.rc.o
-endif
-
-libi420_yuy2_mmx_plugin_la_SOURCES = \
-        ../video_chroma/i420_yuy2.c \
-       ../video_chroma/i420_yuy2.h
-libi420_yuy2_mmx_plugin_la_CFLAGS = $(AM_CFLAGS)
-libi420_yuy2_mmx_plugin_la_LIBADD = $(AM_LIBADD)
-if HAVE_WIN32
-libi420_yuy2_mmx_plugin_la_DEPENDENCIES = libi420_yuy2_mmx_plugin.rc.o
-endif
-
-libi422_yuy2_mmx_plugin_la_SOURCES = \
-        ../video_chroma/i422_yuy2.c \
-       ../video_chroma/i422_yuy2.h
-libi422_yuy2_mmx_plugin_la_CFLAGS = $(AM_CFLAGS)
-libi422_yuy2_mmx_plugin_la_LIBADD = $(AM_LIBADD)
-if HAVE_WIN32
-libi422_yuy2_mmx_plugin_la_DEPENDENCIES = libi422_yuy2_mmx_plugin.rc.o
-endif
-
-libvlc_LTLIBRARIES = \
-       libi420_rgb_mmx_plugin.la \
-       libi420_yuy2_mmx_plugin.la \
-       libi422_yuy2_mmx_plugin.la

diff --git a/modules/video_chroma/Makefile.am b/modules/video_chroma/Makefile.am
index caaff578c8233a9980531c9f53946388e71dd744..20f00000f8ec67a2341ee43879149c834c6dda20 100644 (file)
--- a/modules/video_chroma/Makefile.am
+++ b/modules/video_chroma/Makefile.am
@@ -53,3 +53,21 @@ libvlc_LTLIBRARIES = \
        $(LTLIBswscale)
 
 EXTRA_LTLIBRARIES = libswscale_plugin.la libchroma_omx_plugin.la
+
+# MMX
+libi420_rgb_mmx_plugin_la_SOURCES = i420_rgb.c i420_rgb.h \
+       i420_rgb16.c i420_rgb_mmx.h
+libi420_rgb_mmx_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
+
+libi420_yuy2_mmx_plugin_la_SOURCES = i420_yuy2.c i420_yuy2.h
+libi420_yuy2_mmx_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
+
+libi422_yuy2_mmx_plugin_la_SOURCES = i422_yuy2.c i422_yuy2.h
+libi422_yuy2_mmx_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
+
+if HAVE_MMX
+libvlc_LTLIBRARIES += \
+       libi420_rgb_mmx_plugin.la \
+       libi420_yuy2_mmx_plugin.la \
+       libi422_yuy2_mmx_plugin.la
+endif

diff --git a/modules/video_chroma/i420_rgb16.c b/modules/video_chroma/i420_rgb16.c
index de3cbed9f8b191461ff776da6b0cb6305e007492..c092333b779aef5bac50912b97c6c7a14e3bbfcc 100644 (file)
--- a/modules/video_chroma/i420_rgb16.c
+++ b/modules/video_chroma/i420_rgb16.c
@@ -39,7 +39,7 @@
 #   include "i420_rgb_c.h"
 #   define VLC_TARGET
 #elif defined (MODULE_NAME_IS_i420_rgb_mmx)
-#   include "../mmx/i420_rgb_mmx.h"
+#   include "i420_rgb_mmx.h"
 #   define VLC_TARGET VLC_MMX
 #elif defined (MODULE_NAME_IS_i420_rgb_sse2)
 #   include "../sse2/i420_rgb_sse2.h"

diff --git a/modules/mmx/i420_rgb_mmx.h b/modules/video_chroma/i420_rgb_mmx.h
similarity index 100%
rename from modules/mmx/i420_rgb_mmx.h
rename to modules/video_chroma/i420_rgb_mmx.h