Commit 4ec424aa authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

mmx: merge back into video_chroma (refs #9367)

parent 928e2fbf
......@@ -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
......
......@@ -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
......
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
......@@ -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
......@@ -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"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment