Move swscale.c to the video_filter directory.

diff --git a/modules/codec/ffmpeg/Modules.am b/modules/codec/ffmpeg/Modules.am
index 70dc9121ecb33650f592051168946d4891356e40..ca7890239a98740aaea3afb1c727f12c4713bcfe 100644 (file)
--- 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 39649d5f5bf0b1e8a65fb411b4ea93d6c0dc9876..2fdc2e9922859333271d6f703be2bbfdbd61668f 100644 (file)
--- 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 d6726162039d2eceb8017ee1feb75e4ee69252b3..65bf56104fc44efbedbdb6e6c012cd546ff662f2 100644 (file)
--- 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