From 7202406fe8c32abebfef2f8acbd745b962bb21fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= Date: Tue, 1 Oct 2024 03:09:11 +0200 Subject: [PATCH] various: remove global.h inclusion where not needed --- audio/decode/ad_lavc.c | 1 - options/m_config_frontend.c | 1 - options/m_config_frontend.h | 1 - options/parse_commandline.c | 1 - player/client.c | 1 - player/configfiles.c | 1 - player/loadfile.c | 1 - player/misc.c | 1 - player/screenshot.c | 1 - player/sub.c | 1 - stream/stream_cb.c | 1 - sub/ass_mp.c | 1 - test/repack.c | 1 - video/decode/vd_lavc.c | 1 - video/filter/vf_gpu.h | 3 ++- video/out/gpu/video.c | 1 - video/out/opengl/context.h | 1 - video/out/vo_dmabuf_wayland.c | 1 - video/out/vo_gpu.c | 1 - 19 files changed, 2 insertions(+), 19 deletions(-) diff --git a/audio/decode/ad_lavc.c b/audio/decode/ad_lavc.c index 9eb308528d..512ef9012c 100644 --- a/audio/decode/ad_lavc.c +++ b/audio/decode/ad_lavc.c @@ -33,7 +33,6 @@ #include "audio/fmt-conversion.h" #include "common/av_common.h" #include "common/codecs.h" -#include "common/global.h" #include "common/msg.h" #include "demux/packet.h" #include "demux/stheader.h" diff --git a/options/m_config_frontend.c b/options/m_config_frontend.c index 1182983d31..99d936cfc4 100644 --- a/options/m_config_frontend.c +++ b/options/m_config_frontend.c @@ -27,7 +27,6 @@ #include "libmpv/client.h" #include "common/common.h" -#include "common/global.h" #include "common/msg_control.h" #include "common/msg.h" #include "m_config_frontend.h" diff --git a/options/m_config_frontend.h b/options/m_config_frontend.h index 6108d9feec..10b2720634 100644 --- a/options/m_config_frontend.h +++ b/options/m_config_frontend.h @@ -23,7 +23,6 @@ #include #include "common/common.h" -#include "common/global.h" #include "common/msg.h" #include "common/msg_control.h" #include "m_config_core.h" diff --git a/options/parse_commandline.c b/options/parse_commandline.c index ce776030c3..b07d8e66db 100644 --- a/options/parse_commandline.c +++ b/options/parse_commandline.c @@ -23,7 +23,6 @@ #include #include "osdep/io.h" -#include "common/global.h" #include "common/msg.h" #include "common/msg_control.h" #include "m_option.h" diff --git a/player/client.c b/player/client.c index 42b311ee5d..b5112d1490 100644 --- a/player/client.c +++ b/player/client.c @@ -26,7 +26,6 @@ #include "common/global.h" #include "common/msg.h" #include "common/msg_control.h" -#include "common/global.h" #include "input/input.h" #include "input/cmd.h" #include "misc/ctype.h" diff --git a/player/configfiles.c b/player/configfiles.c index 3ecb5a19c8..b48c857b35 100644 --- a/player/configfiles.c +++ b/player/configfiles.c @@ -34,7 +34,6 @@ #include "osdep/io.h" -#include "common/global.h" #include "common/encode.h" #include "common/msg.h" #include "misc/ctype.h" diff --git a/player/loadfile.c b/player/loadfile.c index 964b7ef748..57c134c1e4 100644 --- a/player/loadfile.c +++ b/player/loadfile.c @@ -34,7 +34,6 @@ #include "client.h" #include "common/msg.h" #include "common/msg_control.h" -#include "common/global.h" #include "options/path.h" #include "options/m_config.h" #include "options/parse_configfile.h" diff --git a/player/misc.c b/player/misc.c index 036da5cf0b..a19dd17f88 100644 --- a/player/misc.c +++ b/player/misc.c @@ -32,7 +32,6 @@ #include "options/m_property.h" #include "options/m_config.h" #include "common/common.h" -#include "common/global.h" #include "common/encode.h" #include "common/playlist.h" #include "input/input.h" diff --git a/player/screenshot.c b/player/screenshot.c index aa637e6e63..2bcef87a30 100644 --- a/player/screenshot.c +++ b/player/screenshot.c @@ -21,7 +21,6 @@ #include -#include "common/global.h" #include "osdep/io.h" #include "mpv_talloc.h" diff --git a/player/sub.c b/player/sub.c index bdd19540b0..3902c692b4 100644 --- a/player/sub.c +++ b/player/sub.c @@ -26,7 +26,6 @@ #include "common/msg.h" #include "options/options.h" #include "common/common.h" -#include "common/global.h" #include "stream/stream.h" #include "sub/dec_sub.h" diff --git a/stream/stream_cb.c b/stream/stream_cb.c index 104fff0b05..70128cb476 100644 --- a/stream/stream_cb.c +++ b/stream/stream_cb.c @@ -8,7 +8,6 @@ #include "common/common.h" #include "common/msg.h" -#include "common/global.h" #include "stream.h" #include "options/m_option.h" #include "options/path.h" diff --git a/sub/ass_mp.c b/sub/ass_mp.c index 255d0a077f..c02eb2a545 100644 --- a/sub/ass_mp.c +++ b/sub/ass_mp.c @@ -29,7 +29,6 @@ #include #include "common/common.h" -#include "common/global.h" #include "common/msg.h" #include "options/path.h" #include "ass_mp.h" diff --git a/test/repack.c b/test/repack.c index c6ec506ece..cf6de36aa9 100644 --- a/test/repack.c +++ b/test/repack.c @@ -3,7 +3,6 @@ #include #include "common/common.h" -#include "common/global.h" #include "img_utils.h" #include "sub/draw_bmp.h" #include "sub/osd.h" diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c index d75f2d7530..0a69ba4f3e 100644 --- a/video/decode/vd_lavc.c +++ b/video/decode/vd_lavc.c @@ -30,7 +30,6 @@ #include #include "mpv_talloc.h" -#include "common/global.h" #include "common/msg.h" #include "options/m_config.h" #include "options/options.h" diff --git a/video/filter/vf_gpu.h b/video/filter/vf_gpu.h index 2cc9a16eea..e2387e28e0 100644 --- a/video/filter/vf_gpu.h +++ b/video/filter/vf_gpu.h @@ -18,7 +18,8 @@ #pragma once #include "common/common.h" -#include "common/global.h" + +struct mpv_global; struct offscreen_ctx { struct mp_log *log; diff --git a/video/out/gpu/video.c b/video/out/gpu/video.c index 037d93ca26..6bd1bf1169 100644 --- a/video/out/gpu/video.c +++ b/video/out/gpu/video.c @@ -30,7 +30,6 @@ #include "misc/bstr.h" #include "options/m_config.h" #include "options/path.h" -#include "common/global.h" #include "options/options.h" #include "utils.h" #include "hwdec.h" diff --git a/video/out/opengl/context.h b/video/out/opengl/context.h index c96450ebd5..915583fd04 100644 --- a/video/out/opengl/context.h +++ b/video/out/opengl/context.h @@ -1,6 +1,5 @@ #pragma once -#include "common/global.h" #include "video/out/gpu/context.h" #include "common.h" diff --git a/video/out/vo_dmabuf_wayland.c b/video/out/vo_dmabuf_wayland.c index 8d5d0c5b0a..0ff30b6495 100644 --- a/video/out/vo_dmabuf_wayland.c +++ b/video/out/vo_dmabuf_wayland.c @@ -24,7 +24,6 @@ #include #endif -#include "common/global.h" #include "gpu/hwdec.h" #include "gpu/video.h" #include "mpv_talloc.h" diff --git a/video/out/vo_gpu.c b/video/out/vo_gpu.c index d49a6ba8a2..36a36b019b 100644 --- a/video/out/vo_gpu.c +++ b/video/out/vo_gpu.c @@ -30,7 +30,6 @@ #include "common/common.h" #include "misc/bstr.h" #include "common/msg.h" -#include "common/global.h" #include "options/m_config.h" #include "vo.h" #include "video/mp_image.h"