move swscale and chain with other video conversion filters

diff --git a/modules/video_chroma/Modules.am b/modules/video_chroma/Modules.am
index f7195f935116023923b76b866214b82d46e5959f..ba8584fc7e7c25ae858eda5dc7090dd2328ddb6c 100644 (file)
--- a/modules/video_chroma/Modules.am
+++ b/modules/video_chroma/Modules.am
@@ -34,6 +34,14 @@ SOURCES_yuy2_i420 = \
 
 SOURCES_rv32 = rv32.c
 
+libchain_plugin_la_SOURCES = chain.c
+libchain_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
+
+libswscale_plugin_la_SOURCES = swscale.c ../codec/avcodec/chroma.c
+libswscale_plugin_la_CFLAGS = $(AM_CFLAGS) $(SWSCALE_FLAGS)
+libswscale_plugin_la_LIBADD = $(AM_LIBADD) $(SWSCALE_LIBS)
+EXTRA_LTLIBRARIES += libswscale_plugin.la
+
 libvlc_LTLIBRARIES += \
        libi420_rgb_plugin.la \
        libi420_yuy2_plugin.la \
@@ -43,7 +51,8 @@ libvlc_LTLIBRARIES += \
        libyuy2_i420_plugin.la \
        libyuy2_i422_plugin.la \
        librv32_plugin.la \
-       $(NULL)
+       libchain_plugin.la \
+       $(LTLIBswscale)
 
 libchroma_omx_plugin_la_SOURCES = omxdl.c
 libchroma_omx_plugin_la_CFLAGS = $(AM_CFLAGS) $(OMXIP_CFLAGS)

diff --git a/modules/video_filter/chain.c b/modules/video_chroma/chain.c
similarity index 100%
rename from modules/video_filter/chain.c
rename to modules/video_chroma/chain.c

diff --git a/modules/video_filter/swscale.c b/modules/video_chroma/swscale.c
similarity index 100%
rename from modules/video_filter/swscale.c
rename to modules/video_chroma/swscale.c

diff --git a/modules/video_filter/Modules.am b/modules/video_filter/Modules.am
index 6bb5eaca499cbc1f5c07eb9f3ef33a869928174b..051f809a256f5011e277b802d2ef01fbd1ff7ca1 100644 (file)
--- a/modules/video_filter/Modules.am
+++ b/modules/video_filter/Modules.am
@@ -97,9 +97,7 @@ SOURCES_grain = grain.c
 SOURCES_croppadd = croppadd.c
 SOURCES_canvas = canvas.c
 SOURCES_blendbench = blendbench.c
-SOURCES_chain = chain.c
 SOURCES_postproc = postproc.c
-SOURCES_swscale = swscale.c ../codec/avcodec/chroma.c
 SOURCES_scene = scene.c
 SOURCES_sepia = sepia.c
 SOURCES_yuvp = yuvp.c
@@ -140,7 +138,6 @@ libvlc_LTLIBRARIES += \
        libblendbench_plugin.la \
        libbluescreen_plugin.la \
        libcanvas_plugin.la \
-       libchain_plugin.la \
        libclone_plugin.la \
        libcolorthres_plugin.la \
        libcroppadd_plugin.la \