[vlc-devel] commit: Move swscale.c to the video_filter directory. (Antoine Cellerier )

[git version control]

vlc | branch: master | Antoine Cellerier <dionoea at videolan.org> | Sun Jun  8 00:17:52 2008 +0200| [25f84cd94c4174a3fccea9977c7b2e6e0390ba2e]

Move swscale.c to the video_filter directory.

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

 modules/codec/ffmpeg/Modules.am                  |    7 -------
 modules/video_filter/Modules.am                  |    1 +
 modules/{codec/ffmpeg => video_filter}/swscale.c |    3 ++-
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/modules/codec/ffmpeg/Modules.am b/modules/codec/ffmpeg/Modules.am
index 70dc912..ca78902 100644
--- a/modules/codec/ffmpeg/Modules.am
+++ b/modules/codec/ffmpeg/Modules.am
@@ -34,11 +34,6 @@ EXTRA_libavformat_plugin_la_SOURCES = \
 	mux.c \
 	$(NULL)
 
-SOURCES_swscale = \
-	swscale.c \
-	chroma.h \
-	$(NULL)
-
 SOURCES_imgresample = \
 	imgresample.c \
 	imgresample.h \
@@ -50,13 +45,11 @@ SOURCES_imgresample = \
 libvlc_LTLIBRARIES += \
 	$(LTLIBavcodec) \
 	$(LTLIBavformat) \
-	$(LTLIBswscale) \
 	$(LTLIBimgresample)
 
 EXTRA_LTLIBRARIES += \
 	libavcodec_plugin.la \
 	libavformat_plugin.la \
-	libswscale_plugin.la \
 	libimgresample_plugin.la
 
 # FIXME SOURCES_ffmpegaltivec = \
diff --git a/modules/video_filter/Modules.am b/modules/video_filter/Modules.am
index 39649d5..2fdc2e9 100644
--- a/modules/video_filter/Modules.am
+++ b/modules/video_filter/Modules.am
@@ -41,4 +41,5 @@ SOURCES_croppadd = croppadd.c
 SOURCES_blendbench = blendbench.c
 SOURCES_chain = chain.c
 SOURCES_postproc = postproc.c
+SOURCES_swscale = swscale.c ../codec/ffmpeg/chroma.h
 noinst_HEADERS = filter_common.h filter_picture.h
diff --git a/modules/codec/ffmpeg/swscale.c b/modules/video_filter/swscale.c
similarity index 99%
rename from modules/codec/ffmpeg/swscale.c
rename to modules/video_filter/swscale.c
index d672616..65bf561 100644
--- a/modules/codec/ffmpeg/swscale.c
+++ b/modules/video_filter/swscale.c
@@ -40,7 +40,8 @@
 #   include <ffmpeg/swscale.h>
 #endif
 
-#include "chroma.h"
+/* Gruikkkkkkkkkk!!!!! */
+#include "../codec/ffmpeg/chroma.h"
 
 /****************************************************************************
  * Local prototypes