diff options
author | wm4 <wm4@nowhere> | 2017-12-02 04:33:43 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2017-12-02 04:53:55 +0100 |
commit | 292724538cfbe2a6c713420f8b5be0abf75ad46c (patch) | |
tree | e1bb9a2a16e347f0de3075792d18492b3dd4852c /video/out/opengl | |
parent | 23a9efd124042e7c97f8317bcd8ae5903d039ef7 (diff) | |
download | mpv-292724538cfbe2a6c713420f8b5be0abf75ad46c.tar.bz2 mpv-292724538cfbe2a6c713420f8b5be0abf75ad46c.tar.xz |
video: remove some more hwdec legacy stuff
Finally get rid of all the HWDEC_* things, and instead rely on the
libavutil equivalents. vdpau still uses a shitty hack, but fuck the
vdpau code.
Remove all the now unneeded remains. The vdpau preemption thing was not
unused anymore; if someone cares this could probably be restored.
Diffstat (limited to 'video/out/opengl')
-rw-r--r-- | video/out/opengl/hwdec_d3d11egl.c | 5 | ||||
-rw-r--r-- | video/out/opengl/hwdec_d3d11eglrgb.c | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/video/out/opengl/hwdec_d3d11egl.c b/video/out/opengl/hwdec_d3d11egl.c index e2b188f4b5..e7416330d7 100644 --- a/video/out/opengl/hwdec_d3d11egl.c +++ b/video/out/opengl/hwdec_d3d11egl.c @@ -75,8 +75,7 @@ static void uninit(struct ra_hwdec *hw) { struct priv_owner *p = hw->priv; - if (p->hwctx.ctx) - hwdec_devices_remove(hw->devs, &p->hwctx); + hwdec_devices_remove(hw->devs, &p->hwctx); if (p->d3d11_device) ID3D11Device_Release(p->d3d11_device); @@ -180,9 +179,7 @@ static int init(struct ra_hwdec *hw) ID3D10Multithread_Release(multithread); p->hwctx = (struct mp_hwdec_ctx){ - .type = HWDEC_D3D11VA, .driver_name = hw->driver->name, - .ctx = p->d3d11_device, .av_device_ref = d3d11_wrap_device_ref(p->d3d11_device), }; hwdec_devices_add(hw->devs, &p->hwctx); diff --git a/video/out/opengl/hwdec_d3d11eglrgb.c b/video/out/opengl/hwdec_d3d11eglrgb.c index 78bc38e93e..c8f6580320 100644 --- a/video/out/opengl/hwdec_d3d11eglrgb.c +++ b/video/out/opengl/hwdec_d3d11eglrgb.c @@ -54,8 +54,7 @@ static void uninit(struct ra_hwdec *hw) { struct priv_owner *p = hw->priv; - if (p->hwctx.ctx) - hwdec_devices_remove(hw->devs, &p->hwctx); + hwdec_devices_remove(hw->devs, &p->hwctx); if (p->d3d11_device) ID3D11Device_Release(p->d3d11_device); @@ -137,9 +136,7 @@ static int init(struct ra_hwdec *hw) } p->hwctx = (struct mp_hwdec_ctx){ - .type = HWDEC_D3D11VA, .driver_name = hw->driver->name, - .ctx = p->d3d11_device, .av_device_ref = d3d11_wrap_device_ref(p->d3d11_device), }; hwdec_devices_add(hw->devs, &p->hwctx); |