From bd0af9a7614f230ba62e3426a84925a49de60d51 Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 16 Oct 2019 23:37:06 +0200 Subject: vf_d3d11vpp: remove RGB conversion hack With the previous commit, this is dead code. This also makes the f_autoconvert.c code for this dead code (fortunately). Will probably remove this later. --- filters/f_autoconvert.c | 3 --- filters/f_autoconvert.h | 9 +-------- 2 files changed, 1 insertion(+), 11 deletions(-) (limited to 'filters') diff --git a/filters/f_autoconvert.c b/filters/f_autoconvert.c index 76c93363ca..065092ac64 100644 --- a/filters/f_autoconvert.c +++ b/filters/f_autoconvert.c @@ -65,9 +65,6 @@ struct subfmt_conv { }; static const struct subfmt_conv subfmt_converters[] = { -#if HAVE_D3D_HWACCEL - {IMGFMT_D3D11, vf_d3d11_create_outconv}, -#endif {0} }; diff --git a/filters/f_autoconvert.h b/filters/f_autoconvert.h index c26612f2f9..e8c5a44134 100644 --- a/filters/f_autoconvert.h +++ b/filters/f_autoconvert.h @@ -47,11 +47,7 @@ void mp_autoconvert_add_all_sw_imgfmts(struct mp_autoconvert *c); bool mp_autoconvert_probe_input_video(struct mp_autoconvert *c, struct mp_image *img); -// Add the formats supported by the hwdec interops (or essentially refine them), -// and trigger conversion if hw_subfmts mismatch. This is mostly a hack for -// D3D11/ANGLE (which supports NV12 only). -// Must be called mp_autoconvert_add_imgfmt(), and overrides them where formats -// collide. +// This is pointless. struct mp_hwdec_devices; void mp_autoconvert_add_vo_hwdec_subfmts(struct mp_autoconvert *c, struct mp_hwdec_devices *devs); @@ -75,6 +71,3 @@ void mp_autoconvert_clear(struct mp_autoconvert *c); // See mp_autoconvert.on_audio_format_change. void mp_autoconvert_format_change_continue(struct mp_autoconvert *c); - -// vf_d3d11vpp.c -struct mp_filter *vf_d3d11_create_outconv(struct mp_filter *parent); -- cgit v1.2.3