summaryrefslogtreecommitdiffstats
path: root/video/decode/d3d.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-04-29 23:28:15 +0200
committerwm4 <wm4@nowhere>2016-04-29 23:30:01 +0200
commit64f9e48bf1d67ed22f2488f7135a082a8ffbe716 (patch)
tree54af436abd781db730d18f5b5a387193f883b560 /video/decode/d3d.c
parent016eab220971ecd3d4509bb4936cb579e9b4a7c3 (diff)
downloadmpv-64f9e48bf1d67ed22f2488f7135a082a8ffbe716.tar.bz2
mpv-64f9e48bf1d67ed22f2488f7135a082a8ffbe716.tar.xz
d3d11va, dxva2: return the format struct directly
Slight simplification, IMHO.
Diffstat (limited to 'video/decode/d3d.c')
-rw-r--r--video/decode/d3d.c10
1 files changed, 4 insertions, 6 deletions
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;
}
}