videotoolbox: remove weird format-negotiation between VO and decoder

Originally, there was probably some sort of intention to restrict it to
formats supported by the interop, or something. But in the end it was
overcomplicated nonsense.

In the future, we could use mp_hwdec_ctx.supported_formats or other
mechanisms to handle this in a better way.

mp_hwdec_ctx.ctx is not set to a dummy pointer - hwdec_devices_load() is
only used to detect whether to vo_opengl interop is present, and the
common hwdec code expects that the .ctx field is not NULL.

This also changes videotoolbox-copy to use --videotoolbox-format,
instead of the FFmpeg-set default.

1 files changed, 1 insertions, 6 deletions

diff --git a/video/hwdec.h b/video/hwdec.h
index 9d1035cd6e..f8a089e8c6 100644
--- a/video/hwdec.h
+++ b/video/hwdec.h
@@ -39,7 +39,7 @@ struct mp_hwdec_ctx {
 
     // This is never NULL. Its meaning depends on the .type field:
     //  HWDEC_VDPAU:            struct mp_vaapi_ctx*
-    //  HWDEC_VIDEOTOOLBOX:     struct mp_vt_ctx*
+    //  HWDEC_VIDEOTOOLBOX:     non-NULL dummy pointer
     //  HWDEC_VAAPI:            struct mp_vaapi_ctx*
     //  HWDEC_D3D11VA:          ID3D11Device*
     //  HWDEC_DXVA2:            IDirect3DDevice9*
@@ -64,11 +64,6 @@ struct mp_hwdec_ctx {
                                        struct mp_image_pool *swpool);
 };
 
-struct mp_vt_ctx {
-    void *priv;
-    uint32_t (*get_vt_fmt)(struct mp_vt_ctx *ctx);
-};
-
 // Used to communicate hardware decoder device handles from VO to video decoder.
 struct mp_hwdec_devices;