vlc | branch: master | Steve Lhomme <rob...@videolabs.io> | Wed Nov 22 18:18:23 2017 +0100| [024890fe64fe9f7bbb806ed7ae937ceca65eaa1b] | committer: Jean-Baptiste Kempf
hw:d3d9: move the filters code in hw/d3d9 Signed-off-by: Jean-Baptiste Kempf <j...@videolan.org> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=024890fe64fe9f7bbb806ed7ae937ceca65eaa1b --- modules/hw/d3d9/Makefile.am | 6 +++--- modules/{video_output/win32 => hw/d3d9}/d3d9_adjust.c | 0 modules/{video_chroma => hw/d3d9}/dxa9.c | 4 ++-- modules/{video_output/win32 => hw/d3d9}/dxva2_deinterlace.c | 0 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/hw/d3d9/Makefile.am b/modules/hw/d3d9/Makefile.am index 651c975cd4..0ce35b8efd 100644 --- a/modules/hw/d3d9/Makefile.am +++ b/modules/hw/d3d9/Makefile.am @@ -2,17 +2,17 @@ d3d9dir = $(pluginsdir)/d3d9 d3d9_LTLIBRARIES = # GPU/CPU converter -libdxa9_plugin_la_SOURCES = video_chroma/dxa9.c +libdxa9_plugin_la_SOURCES = hw/d3d9/dxa9.c libdxa9_plugin_la_LIBADD = libd3d9_common.la libchroma_copy.la if HAVE_AVCODEC_DXVA2 d3d9_LTLIBRARIES += libdxa9_plugin.la endif -libdirect3d9_deinterlace_plugin_la_SOURCES = video_output/win32/dxva2_deinterlace.c +libdirect3d9_deinterlace_plugin_la_SOURCES = hw/d3d9/dxva2_deinterlace.c libdirect3d9_deinterlace_plugin_la_LIBADD = libd3d9_common.la $(LIBCOM) libdeinterlace_common.la libdirect3d9_deinterlace_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' -libdirect3d9_adjust_plugin_la_SOURCES = video_output/win32/d3d9_adjust.c +libdirect3d9_adjust_plugin_la_SOURCES = hw/d3d9/d3d9_adjust.c libdirect3d9_adjust_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)' libdirect3d9_adjust_plugin_la_LIBADD = libd3d9_common.la $(LIBCOM) diff --git a/modules/video_output/win32/d3d9_adjust.c b/modules/hw/d3d9/d3d9_adjust.c similarity index 100% rename from modules/video_output/win32/d3d9_adjust.c rename to modules/hw/d3d9/d3d9_adjust.c diff --git a/modules/video_chroma/dxa9.c b/modules/hw/d3d9/dxa9.c similarity index 99% rename from modules/video_chroma/dxa9.c rename to modules/hw/d3d9/dxa9.c index 281465ac34..9b8ea161e2 100644 --- a/modules/video_chroma/dxa9.c +++ b/modules/hw/d3d9/dxa9.c @@ -35,11 +35,11 @@ #include <vlc_picture.h> #include <vlc_modules.h> -#include "copy.h" +#include "../../video_chroma/copy.h" #include <windows.h> #include <d3d9.h> -#include "d3d9_fmt.h" +#include "../../video_chroma/d3d9_fmt.h" struct filter_sys_t { /* GPU to CPU */ diff --git a/modules/video_output/win32/dxva2_deinterlace.c b/modules/hw/d3d9/dxva2_deinterlace.c similarity index 100% rename from modules/video_output/win32/dxva2_deinterlace.c rename to modules/hw/d3d9/dxva2_deinterlace.c _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits