Move imgresample.c to the video_filter directory.

diff --git a/modules/codec/ffmpeg/Modules.am b/modules/codec/ffmpeg/Modules.am
index 43352a006c011ba08b8ab3ad747bc14dbbe99228..67cfb8ab7b9f67ece6a877cf913b5e5a3bd0c3b4 100644 (file)
--- a/modules/codec/ffmpeg/Modules.am
+++ b/modules/codec/ffmpeg/Modules.am
@@ -17,18 +17,11 @@ EXTRA_libavcodec_plugin_la_SOURCES = \
        encoder.c \
        $(NULL)
 
-SOURCES_imgresample = \
-       imgresample.c \
-       chroma.h \
-       $(NULL)
-
 libvlc_LTLIBRARIES += \
-       $(LTLIBavcodec) \
-       $(LTLIBimgresample)
+       $(LTLIBavcodec)
 
 EXTRA_LTLIBRARIES += \
-       libavcodec_plugin.la \
-       libimgresample_plugin.la
+       libavcodec_plugin.la
 
 # FIXME SOURCES_ffmpegaltivec = \
 # FIXME        ffmpeg.c \

diff --git a/modules/video_filter/Modules.am b/modules/video_filter/Modules.am
index 2fdc2e9922859333271d6f703be2bbfdbd61668f..1b2a320b164d0b65a8942e3187b92b66f9d8f3e3 100644 (file)
--- a/modules/video_filter/Modules.am
+++ b/modules/video_filter/Modules.am
@@ -42,4 +42,5 @@ SOURCES_blendbench = blendbench.c
 SOURCES_chain = chain.c
 SOURCES_postproc = postproc.c
 SOURCES_swscale = swscale.c ../codec/ffmpeg/chroma.h
+SOURCES_imgresample = imgresample.c ../codec/ffmpeg/chroma.h
 noinst_HEADERS = filter_common.h filter_picture.h

diff --git a/modules/codec/ffmpeg/imgresample.c b/modules/video_filter/imgresample.c
similarity index 99%
rename from modules/codec/ffmpeg/imgresample.c
rename to modules/video_filter/imgresample.c
index 4fd025aa30ffa15c4190ec022bf143a579064320..688debc4dcf1962976214f9a6d1b0d7a09ed9cbe 100644 (file)
--- a/modules/codec/ffmpeg/imgresample.c
+++ b/modules/video_filter/imgresample.c
@@ -43,7 +43,7 @@
 #   include <avcodec.h>
 #endif
 
-#include "chroma.h"
+#include "../codec/ffmpeg/chroma.h"
 
 /*****************************************************************************
  * Local prototypes