[vlc-commits] FourCC: add D3D11 opaque GPU surface

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at gmail.com> | Thu May 28 16:27:46 2015 +0200| [8a7b1417015346444b6d0a329a95a1dada535429] | committer: Jean-Baptiste Kempf

FourCC: add D3D11 opaque GPU surface

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

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

 include/vlc_fourcc.h |    3 +++
 src/misc/fourcc.c    |    3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h
index df82f6f..1494ca7 100644
--- a/include/vlc_fourcc.h
+++ b/include/vlc_fourcc.h
@@ -335,6 +335,9 @@
 /* DXVA2 opaque video surface for use with D3D9 */
 #define VLC_CODEC_D3D9_OPAQUE     VLC_FOURCC('D','X','A','9')
 
+/* D3D11VA opaque video surface for use with D3D11 */
+#define VLC_CODEC_D3D11_OPAQUE    VLC_FOURCC('D','X','1','1')
+
 /* Image codec (video) */
 #define VLC_CODEC_PNG             VLC_FOURCC('p','n','g',' ')
 #define VLC_CODEC_PPM             VLC_FOURCC('p','p','m',' ')
diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c
index 14b4805..69b47a7 100644
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -2192,7 +2192,8 @@ static const struct
     { { VLC_CODEC_VDPAU_VIDEO_420, VLC_CODEC_VDPAU_VIDEO_422,
         VLC_CODEC_VDPAU_VIDEO_444, VLC_CODEC_VDPAU_OUTPUT },
                                                FAKE_FMT() },
-    { { VLC_CODEC_ANDROID_OPAQUE, VLC_CODEC_MMAL_OPAQUE, VLC_CODEC_D3D9_OPAQUE, },
+    { { VLC_CODEC_ANDROID_OPAQUE, VLC_CODEC_MMAL_OPAQUE,
+        VLC_CODEC_D3D9_OPAQUE,    VLC_CODEC_D3D11_OPAQUE },
                                                FAKE_FMT() },
 
     { { 0 },                                   FAKE_FMT() }