summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-05-03 15:46:16 +0200
committerwm4 <wm4@nowhere>2016-05-03 15:46:16 +0200
commit5be40f035b03b5dbc891f463ae90575243adf301 (patch)
tree7f2ae9230ea4afe36bf8507e3dc155ae442ea31f
parenteefe7ad28bceccd509d389dc4dba465467231fb1 (diff)
downloadmpv-5be40f035b03b5dbc891f463ae90575243adf301.tar.bz2
mpv-5be40f035b03b5dbc891f463ae90575243adf301.tar.xz
d3d: DXVA2_ModeMPEG2_VLD supports all profiles
Fixes hardware decoding of most mpeg2 things.
-rw-r--r--video/decode/d3d.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/video/decode/d3d.c b/video/decode/d3d.c
index 38ff8c5e04..df10c9fe19 100644
--- a/video/decode/d3d.c
+++ b/video/decode/d3d.c
@@ -48,7 +48,6 @@ DEFINE_GUID(DXVA2_ModeVP9_VLD_Profile0, 0x463707f8, 0xa1d0, 0x4585, 0x87
DEFINE_GUID(DXVA2_NoEncrypt, 0x1b81beD0, 0xa0c7, 0x11d3, 0xb9, 0x84, 0x00, 0xc0, 0x4f, 0x2e, 0x73, 0xc5);
-static const int PROF_MPEG2_SIMPLE[] = {FF_PROFILE_MPEG2_SIMPLE, 0};
static const int PROF_MPEG2_MAIN[] = {FF_PROFILE_MPEG2_SIMPLE,
FF_PROFILE_MPEG2_MAIN, 0};
static const int PROF_H264_HIGH[] = {FF_PROFILE_H264_CONSTRAINED_BASELINE,
@@ -70,7 +69,7 @@ struct d3dva_mode {
// Prefered modes must come first
static const struct d3dva_mode d3dva_modes[] = {
// MPEG-1/2
- {MODE2(MPEG2_VLD), AV_CODEC_ID_MPEG2VIDEO, PROF_MPEG2_SIMPLE},
+ {MODE2(MPEG2_VLD), AV_CODEC_ID_MPEG2VIDEO, PROF_MPEG2_MAIN},
{MODE2(MPEG2and1_VLD), AV_CODEC_ID_MPEG2VIDEO, PROF_MPEG2_MAIN},
{MODE2(MPEG2and1_VLD), AV_CODEC_ID_MPEG1VIDEO},