From 64f9e48bf1d67ed22f2488f7135a082a8ffbe716 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Fri, 29 Apr 2016 23:28:15 +0200
Subject: d3d11va, dxva2: return the format struct directly

Slight simplification, IMHO.
---
 video/decode/d3d.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'video/decode/d3d.c')

diff --git a/video/decode/d3d.c b/video/decode/d3d.c
index e55ca22073..38ff8c5e04 100644
--- a/video/decode/d3d.c
+++ b/video/decode/d3d.c
@@ -137,9 +137,8 @@ struct d3d_decoder_fmt d3d_select_decoder_mode(
                         const struct d3d_decoded_format *fmt))
 {
     struct d3d_decoder_fmt fmt = {
-        .guid          = &GUID_NULL,
-        .mpfmt_decoded = IMGFMT_NONE,
-        .dxfmt_decoded = 0,
+        .guid   = &GUID_NULL,
+        .format = NULL,
     };
 
     // this has the right bit-depth, but is unfortunately not the native format
@@ -168,9 +167,8 @@ struct d3d_decoder_fmt d3d_select_decoder_mode(
                         MP_VERBOSE(s, "%d\n", (int)format->dxfmt);
                     }
 
-                    fmt.guid          = mode->guid;
-                    fmt.mpfmt_decoded = format->mpfmt;
-                    fmt.dxfmt_decoded = format->dxfmt;
+                    fmt.guid   = mode->guid;
+                    fmt.format = format;
                     return fmt;
                 }
             }
-- 
cgit v1.2.3