summaryrefslogtreecommitdiffstats
path: root/options/options.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2018-05-21 16:05:03 +0200
committerwm4 <wm4@nowhere>2018-05-24 19:56:35 +0200
commita770006c6ec1c0173e33a63d36cafca743e63808 (patch)
tree9de13d0e85adc5dc025de829947f99af68b77dfb /options/options.c
parent3569857b7580f9037f5168a2e3888a86cc3a85a0 (diff)
downloadmpv-a770006c6ec1c0173e33a63d36cafca743e63808.tar.bz2
mpv-a770006c6ec1c0173e33a63d36cafca743e63808.tar.xz
vd_lavc: move hwdec opts to local config, don't use global MPOpts
The --hwdec* options are a good fit for the vd_lavc local option struct. This annoyingly requires manual prefixing of most of these options with --vd-lavc (could be avoided by using more sub-struct craziness, but let's not).
Diffstat (limited to 'options/options.c')
-rw-r--r--options/options.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/options/options.c b/options/options.c
index c9ed2f0008..5a77e9973d 100644
--- a/options/options.c
+++ b/options/options.c
@@ -511,18 +511,13 @@ const m_option_t mp_opts[] = {
OPT_STRING("audio-spdif", audio_spdif, 0),
- OPT_STRING_VALIDATE("hwdec", hwdec_api, M_OPT_OPTIONAL_PARAM,
- hwdec_validate_opt),
- OPT_STRING("hwdec-codecs", hwdec_codecs, 0),
- 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
OPT_ASPECT("video-aspect", movie_aspect, UPDATE_IMGPAR, -1.0, 10.0),
OPT_CHOICE("video-aspect-method", aspect_method, UPDATE_IMGPAR,
({"bitstream", 1}, {"container", 2})),
- OPT_SUBSTRUCT("vd-lavc", vd_lavc_params, vd_lavc_conf, 0),
+ OPT_SUBSTRUCT("", vd_lavc_params, vd_lavc_conf, 0),
OPT_SUBSTRUCT("ad-lavc", ad_lavc_params, ad_lavc_conf, 0),
OPT_SUBSTRUCT("", demux_lavf, demux_lavf_conf, 0),
@@ -947,9 +942,6 @@ const struct MPOpts mp_default_opts = {
.osd_bar_visible = 1,
.screenshot_template = "mpv-shot%n",
- .hwdec_api = HAVE_RPI ? "mmal" : "no",
- .hwdec_codecs = "h264,vc1,wmv3,hevc,mpeg2video,vp9",
-
.audio_output_channels = {
.set = 1,
.auto_safe = 1,