[vlc-commits] move swscale and chain with other video conversion filters

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Jul 21 16:43:45 2013 +0300| [2c5e4d39a68518bede492daf2e0e545241234099] | committer: Rémi Denis-Courmont

move swscale and chain with other video conversion filters

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2c5e4d39a68518bede492daf2e0e545241234099
---

 modules/video_chroma/Modules.am                  |   11 ++++++++++-
 modules/{video_filter => video_chroma}/chain.c   |    0
 modules/{video_filter => video_chroma}/swscale.c |    0
 modules/video_filter/Modules.am                  |    3 ---
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/modules/video_chroma/Modules.am b/modules/video_chroma/Modules.am
index f7195f9..ba8584f 100644
--- 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 6bb5eac..051f809 100644
--- 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 \