[vlc-commits] direct3d11: rename the decoder device to "d3d11"

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Thu Feb 13 16:02:40 2020 +0100| [ef6e16c80cabfb00e91ea9b0313f8387687f011d] | committer: Steve Lhomme

direct3d11: rename the decoder device to "d3d11"

This easier to set by users than "d3d11-device".

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

 lib/media_player.c               | 2 +-
 modules/hw/d3d11/d3d11_filters.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/media_player.c b/lib/media_player.c
index f68c5bf0c3..19fb876ac5 100644
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -1065,7 +1065,7 @@ bool libvlc_video_set_output_callbacks(libvlc_media_player_t *mp,
     else if ( engine == libvlc_video_engine_d3d11 )
     {
         var_SetString ( mp, "vout", "direct3d11" );
-        var_SetString ( mp, "dec-dev", "d3d11-device" );
+        var_SetString ( mp, "dec-dev", "d3d11" );
     }
     else if ( engine == libvlc_video_engine_d3d9 )
     {
diff --git a/modules/hw/d3d11/d3d11_filters.c b/modules/hw/d3d11/d3d11_filters.c
index 368e24cc5e..c38dcb2316 100644
--- a/modules/hw/d3d11/d3d11_filters.c
+++ b/modules/hw/d3d11/d3d11_filters.c
@@ -616,6 +616,6 @@ vlc_module_begin()
     /* LEGACY, the d3dcontext and swapchain were given by the host app */
     add_integer("winrt-d3dcontext",    0x0, NULL, NULL, true) /* ID3D11DeviceContext* */
 #endif /* VLC_WINSTORE_APP */
-    add_shortcut ("d3d11-device")
+    add_shortcut ("d3d11")
 
 vlc_module_end()