From ac295960b8486f104a6aa800d8d31ca2eeba99a0 Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 16 Oct 2017 14:37:28 +0200 Subject: video: make it possible to always override hardware decoding format Mostly an obscure option for testing. But --videotoolbox-format can be deprecated, as it becomes redundant. We rely on the libavutil hwcontext implementation to reject invalid pixfmts, or not to blow up if they are incompatible. --- options/options.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'options/options.c') diff --git a/options/options.c b/options/options.c index e0f7e2b7e8..2f26402526 100644 --- a/options/options.c +++ b/options/options.c @@ -443,8 +443,10 @@ const m_option_t mp_opts[] = { OPT_CHOICE_C("hwdec", hwdec_api, 0, mp_hwdec_names), OPT_STRING("hwdec-codecs", hwdec_codecs, 0), #if HAVE_VIDEOTOOLBOX_HWACCEL - OPT_IMAGEFORMAT("videotoolbox-format", videotoolbox_format, 0, .min = -1), + OPT_IMAGEFORMAT("videotoolbox-format", videotoolbox_format, 0, .min = -1, + .deprecation_message = "use --hwdec-image-format instead"), #endif + OPT_IMAGEFORMAT("hwdec-image-format", hwdec_image_format, 0, .min = -1), // -1 means auto aspect (prefer container size until aspect change) // 0 means square pixels -- cgit v1.2.3