From c0807e98fbc808b50d58ae88b4ae05b0cd956e69 Mon Sep 17 00:00:00 2001 From: Christoph Heinrich Date: Tue, 21 Feb 2023 03:07:51 +0100 Subject: [PATCH] options: remove explicit initialization of integers to 0 --- audio/out/ao_alsa.c | 1 - options/options.c | 4 ---- stream/stream_dvb.c | 1 - video/out/drm_common.c | 1 - video/out/vo_sixel.c | 6 ------ video/out/vulkan/context_display.c | 6 +----- 6 files changed, 1 insertion(+), 18 deletions(-) diff --git a/audio/out/ao_alsa.c b/audio/out/ao_alsa.c index 64a41901c3..75eda3bbf8 100644 --- a/audio/out/ao_alsa.c +++ b/audio/out/ao_alsa.c @@ -79,7 +79,6 @@ static const struct m_sub_options ao_alsa_conf = { .defaults = &(const struct ao_alsa_opts) { .mixer_device = "default", .mixer_name = "Master", - .mixer_index = 0, .buffer_time = 100000, .frags = 4, }, diff --git a/options/options.c b/options/options.c index 41643111f1..2beb5d01b8 100644 --- a/options/options.c +++ b/options/options.c @@ -974,7 +974,6 @@ static const struct MPOpts mp_default_opts = { .msg_color = true, .softvol_max = 130, .softvol_volume = 100, - .softvol_mute = 0, .gapless_audio = -1, .wintitle = "${?media-title:${media-title}}${!media-title:No file} - mpv", .stop_screensaver = 1, @@ -1022,7 +1021,6 @@ static const struct MPOpts mp_default_opts = { .playlist_pos = -1, .play_frames = -1, .rebase_start_time = true, - .keep_open = 0, .keep_open_pause = true, .image_display_duration = 1.0, .stream_id = { { [STREAM_AUDIO] = -1, @@ -1037,9 +1035,7 @@ static const struct MPOpts mp_default_opts = { .audio_output_format = 0, // AF_FORMAT_UNKNOWN .playback_speed = 1., .pitch_correction = true, - .sub_auto = 0, .audiofile_auto = -1, - .coverart_auto = 0, .coverart_whitelist = true, .osd_bar_visible = true, .screenshot_template = "mpv-shot%n", diff --git a/stream/stream_dvb.c b/stream/stream_dvb.c index 14ff2f4ca4..e6cac0048a 100644 --- a/stream/stream_dvb.c +++ b/stream/stream_dvb.c @@ -85,7 +85,6 @@ const struct m_sub_options stream_dvb_conf = { .size = sizeof(dvb_opts_t), .defaults = &(const dvb_opts_t){ .cfg_prog = NULL, - .cfg_devno = 0, .cfg_timeout = 30, }, }; diff --git a/video/out/drm_common.c b/video/out/drm_common.c index 09494d6317..470cab4668 100644 --- a/video/out/drm_common.c +++ b/video/out/drm_common.c @@ -109,7 +109,6 @@ const struct m_sub_options drm_conf = { .drm_atomic = 1, .draw_plane = DRM_OPTS_PRIMARY_PLANE, .drmprime_video_plane = DRM_OPTS_OVERLAY_PLANE, - .vrr_enabled = 0, }, .size = sizeof(struct drm_opts), }; diff --git a/video/out/vo_sixel.c b/video/out/vo_sixel.c index d052e7dbd9..873c7875cc 100644 --- a/video/out/vo_sixel.c +++ b/video/out/vo_sixel.c @@ -587,17 +587,11 @@ const struct vo_driver video_out_sixel = { .priv_size = sizeof(struct priv), .priv_defaults = &(const struct priv) { .opts.diffuse = DIFFUSE_AUTO, - .opts.width = 0, - .opts.height = 0, .opts.reqcolors = 256, .opts.threshold = -1, .opts.fixedpal = true, - .opts.top = 0, - .opts.left = 0, .opts.pad_y = -1, .opts.pad_x = -1, - .opts.rows = 0, - .opts.cols = 0, .opts.config_clear = true, .opts.alt_screen = true, }, diff --git a/video/out/vulkan/context_display.c b/video/out/vulkan/context_display.c index 4568f1dc46..da801dd921 100644 --- a/video/out/vulkan/context_display.c +++ b/video/out/vulkan/context_display.c @@ -274,11 +274,7 @@ const struct m_sub_options vulkan_display_conf = { {0} }, .size = sizeof(struct vulkan_display_opts), - .defaults = &(struct vulkan_display_opts) { - .display = 0, - .mode = 0, - .plane = 0, - }, + .defaults = &(struct vulkan_display_opts) {0}, }; struct priv {