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

git version control git at videolan.org
Mon Jun 9 10:03:52 CEST 2008


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

Move imgresample.c to the video_filter directory.

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

 modules/codec/ffmpeg/Modules.am                    |   11 ++---------
 modules/video_filter/Modules.am                    |    1 +
 .../{codec/ffmpeg => video_filter}/imgresample.c   |    2 +-
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/modules/codec/ffmpeg/Modules.am b/modules/codec/ffmpeg/Modules.am
index 43352a0..67cfb8a 100644
--- 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 2fdc2e9..1b2a320 100644
--- 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 4fd025a..688debc 100644
--- 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




More information about the vlc-devel mailing list