[vlc-commits] direct3d9: rename dxva2_deinterlace to direct3d9_deinterlace

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at videolabs.io> | Fri Jun 16 11:14:08 2017 +0200| [b5c431b11ec91d8ecc764922ed4b47a0492491bd] | committer: Jean-Baptiste Kempf

direct3d9: rename dxva2_deinterlace to direct3d9_deinterlace

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 configure.ac                     |  2 +-
 modules/MODULES_LIST             |  2 +-
 modules/video_output/Makefile.am | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index 2a76ef003e..ceefa3a915 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3295,7 +3295,7 @@ AS_IF([test "${enable_directx}" != "no"], [
 
     AC_CHECK_FUNCS([IDirectXVideoProcessorService_GetVideoProcessorDeviceGuids],
       [
-        VLC_ADD_PLUGIN([dxva2_deinterlace])
+        VLC_ADD_PLUGIN([direct3d9_deinterlace])
       ],
       [AC_MSG_WARN([Could not find required IDirectXVideoDecoder in dxva2api.h])],
       [#include <d3d9.h>
diff --git a/modules/MODULES_LIST b/modules/MODULES_LIST
index 04468e438d..0ba21b4946 100644
--- a/modules/MODULES_LIST
+++ b/modules/MODULES_LIST
@@ -107,6 +107,7 @@ $Id$
  * direct3d11: video output module using the Direct3D11 API
  * direct3d11_deinterlace: deinterlacer for Direct3D11 video decoding
  * direct3d9: video output module using the Direct3D9 API
+ * direct3d9_deinterlace: deinterlacer for Direct3D9/DxVA video decoding
  * directdraw: video output module using the DirectDraw API
  * directfb: Direct Framebuffer video output
  * directsound: audio output module using the DirectSound API
@@ -124,7 +125,6 @@ $Id$
  * dvdread: input module for accessing DVDs, uses libdvdread
  * dxa9: Convert D3D9 GPU textures to YUV planes
  * dxva2: DxVA2 hardware-accelerated decoding
- * dxva2_deinterlace: deinterlacer for DxVA 2.0 video decoding
  * dynamicoverlay: subpicture filter using shared memory that can be written to by external applications
  * edgedetection: edge detection video filter
  * edummy: dummy encoder
diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am
index 2e7c5d8ba7..8f0618c6eb 100644
--- a/modules/video_output/Makefile.am
+++ b/modules/video_output/Makefile.am
@@ -237,14 +237,14 @@ libdirect3d9_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
 	-DMODULE_NAME_IS_direct3d9
 libdirect3d9_plugin_la_LIBADD = -lgdi32 $(LIBCOM) -luuid
 libdirect3d9_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
-libdxva2_deinterlace_plugin_la_SOURCES = video_output/win32/dxva2_deinterlace.c \
-	video_chroma/d3d9_fmt.h
-libdxva2_deinterlace_plugin_la_LIBADD = $(LIBCOM)
-libdxva2_deinterlace_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
+libdirect3d9_deinterlace_plugin_la_SOURCES = video_output/win32/dxva2_deinterlace.c \
+        video_chroma/d3d9_fmt.h
+libdirect3d9_deinterlace_plugin_la_LIBADD = $(LIBCOM)
+libdirect3d9_deinterlace_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
 if HAVE_WIN32_DESKTOP
 vout_LTLIBRARIES += $(LTLIBdirect3d9)
-vout_LTLIBRARIES += $(LTLIBdxva2_deinterlace)
-EXTRA_LTLIBRARIES += libdirect3d9_plugin.la libdxva2_deinterlace_plugin.la
+vout_LTLIBRARIES += $(LTLIBdirect3d9_deinterlace)
+EXTRA_LTLIBRARIES += libdirect3d9_plugin.la libdirect3d9_deinterlace_plugin.la
 endif
 
 libdirect3d11_plugin_la_SOURCES = video_output/win32/direct3d11.c \