summaryrefslogtreecommitdiffstats
path: root/options
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-10-16 14:37:28 +0200
committerwm4 <wm4@nowhere>2017-10-16 15:02:12 +0200
commitac295960b8486f104a6aa800d8d31ca2eeba99a0 (patch)
treecfe27fa57e2939810f8ae3b765b86c2b63a3dd45 /options
parent23da3ed21a3897c374e01e68988e7dc24b705cfa (diff)
downloadmpv-ac295960b8486f104a6aa800d8d31ca2eeba99a0.tar.bz2
mpv-ac295960b8486f104a6aa800d8d31ca2eeba99a0.tar.xz
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.
Diffstat (limited to 'options')
-rw-r--r--options/options.c4
-rw-r--r--options/options.h1
2 files changed, 4 insertions, 1 deletions
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
diff --git a/options/options.h b/options/options.h
index 3bb2a0a311..e56ed7d619 100644
--- a/options/options.h
+++ b/options/options.h
@@ -292,6 +292,7 @@ typedef struct MPOpts {
int hwdec_api;
char *hwdec_codecs;
int videotoolbox_format;
+ int hwdec_image_format;
int w32_priority;