various: remove global.h inclusion where not needed

Kacper Michajłow committed 2 years ago

Commit 72024061 parent c11239b19 files · +2 −19Browse files

Unified · Split

19 files

audio/decode/ad_lavc.c +0 −1
options/m_config_frontend.c +0 −1
options/m_config_frontend.h +0 −1
options/parse_commandline.c +0 −1
player/client.c +0 −1
player/configfiles.c +0 −1
player/loadfile.c +0 −1
player/misc.c +0 −1
player/screenshot.c +0 −1
player/sub.c +0 −1
stream/stream_cb.c +0 −1
sub/ass_mp.c +0 −1
test/repack.c +0 −1
video/decode/vd_lavc.c +0 −1
video/filter/vf_gpu.h +2 −1
video/out/gpu/video.c +0 −1
video/out/opengl/context.h +0 −1
video/out/vo_dmabuf_wayland.c +0 −1
video/out/vo_gpu.c +0 −1

audio/decode/ad_lavc.c+0−1

@@ -33,7 +33,6 @@ · 32 unmodified lines
33	33	#include "audio/fmt-conversion.h"
34	34	#include "common/av_common.h"
35	35	#include "common/codecs.h"
36		−#include "common/global.h"
37	36	#include "common/msg.h"
38	37	#include "demux/packet.h"
39	38	#include "demux/stheader.h"

options/m_config_frontend.c+0−1

@@ -27,7 +27,6 @@ · 26 unmodified lines
27	27	#include "libmpv/client.h"
28	28
29	29	#include "common/common.h"
30		−#include "common/global.h"
31	30	#include "common/msg_control.h"
32	31	#include "common/msg.h"
33	32	#include "m_config_frontend.h"

options/m_config_frontend.h+0−1

@@ -23,7 +23,6 @@ · 22 unmodified lines
23	23	#include <stdint.h>
24	24
25	25	#include "common/common.h"
26		−#include "common/global.h"
27	26	#include "common/msg.h"
28	27	#include "common/msg_control.h"
29	28	#include "m_config_core.h"

options/parse_commandline.c+0−1

@@ -23,7 +23,6 @@ · 22 unmodified lines
23	23	#include <stdbool.h>
24	24
25	25	#include "osdep/io.h"
26		−#include "common/global.h"
27	26	#include "common/msg.h"
28	27	#include "common/msg_control.h"
29	28	#include "m_option.h"

player/client.c+0−1

@@ -26,7 +26,6 @@ · 25 unmodified lines
26	26	#include "common/global.h"
27	27	#include "common/msg.h"
28	28	#include "common/msg_control.h"
29		−#include "common/global.h"
30	29	#include "input/input.h"
31	30	#include "input/cmd.h"
32	31	#include "misc/ctype.h"

player/configfiles.c+0−1

@@ -34,7 +34,6 @@ · 33 unmodified lines
34	34
35	35	#include "osdep/io.h"
36	36
37		−#include "common/global.h"
38	37	#include "common/encode.h"
39	38	#include "common/msg.h"
40	39	#include "misc/ctype.h"

player/loadfile.c+0−1

@@ -34,7 +34,6 @@ · 33 unmodified lines
34	34	#include "client.h"
35	35	#include "common/msg.h"
36	36	#include "common/msg_control.h"
37		−#include "common/global.h"
38	37	#include "options/path.h"
39	38	#include "options/m_config.h"
40	39	#include "options/parse_configfile.h"

player/misc.c+0−1

@@ -32,7 +32,6 @@ · 31 unmodified lines
32	32	#include "options/m_property.h"
33	33	#include "options/m_config.h"
34	34	#include "common/common.h"
35		−#include "common/global.h"
36	35	#include "common/encode.h"
37	36	#include "common/playlist.h"
38	37	#include "input/input.h"

player/screenshot.c+0−1

@@ -21,7 +21,6 @@ · 20 unmodified lines
21	21
22	22	#include <libavcodec/avcodec.h>
23	23
24		−#include "common/global.h"
25	24	#include "osdep/io.h"
26	25
27	26	#include "mpv_talloc.h"

player/sub.c+0−1

@@ -26,7 +26,6 @@ · 25 unmodified lines
26	26	#include "common/msg.h"
27	27	#include "options/options.h"
28	28	#include "common/common.h"
29		−#include "common/global.h"
30	29
31	30	#include "stream/stream.h"
32	31	#include "sub/dec_sub.h"

stream/stream_cb.c+0−1

@@ -8,7 +8,6 @@ · 7 unmodified lines
8	8
9	9	#include "common/common.h"
10	10	#include "common/msg.h"
11		−#include "common/global.h"
12	11	#include "stream.h"
13	12	#include "options/m_option.h"
14	13	#include "options/path.h"

sub/ass_mp.c+0−1

@@ -29,7 +29,6 @@ · 28 unmodified lines
29	29	#include <ass/ass_types.h>
30	30
31	31	#include "common/common.h"
32		−#include "common/global.h"
33	32	#include "common/msg.h"
34	33	#include "options/path.h"
35	34	#include "ass_mp.h"

test/repack.c+0−1

@@ -3,7 +3,6 @@ · 2 unmodified lines
3	3	#include <libavutil/pixfmt.h>
4	4
5	5	#include "common/common.h"
6		−#include "common/global.h"
7	6	#include "img_utils.h"
8	7	#include "sub/draw_bmp.h"
9	8	#include "sub/osd.h"

video/decode/vd_lavc.c+0−1

@@ -30,7 +30,6 @@ · 29 unmodified lines
30	30	#include <libavutil/pixdesc.h>
31	31
32	32	#include "mpv_talloc.h"
33		−#include "common/global.h"
34	33	#include "common/msg.h"
35	34	#include "options/m_config.h"
36	35	#include "options/options.h"

video/filter/vf_gpu.h+2−1

@@ -18,7 +18,8 @@ · 17 unmodified lines
18	18	#pragma once
19	19
20	20	#include "common/common.h"
21		−#include "common/global.h"
	21	+
	22	+struct mpv_global;
22	23
23	24	struct offscreen_ctx {
24	25	struct mp_log *log;

video/out/gpu/video.c+0−1

@@ -30,7 +30,6 @@ · 29 unmodified lines
30	30	#include "misc/bstr.h"
31	31	#include "options/m_config.h"
32	32	#include "options/path.h"
33		−#include "common/global.h"
34	33	#include "options/options.h"
35	34	#include "utils.h"
36	35	#include "hwdec.h"

video/out/opengl/context.h+0−1

@@ -1,6 +1,5 @@
1	1	#pragma once
2	2
3		−#include "common/global.h"
4	3	#include "video/out/gpu/context.h"
5	4	#include "common.h"
6	5

video/out/vo_dmabuf_wayland.c+0−1

@@ -24,7 +24,6 @@ · 23 unmodified lines
24	24	#include <va/va_drmcommon.h>
25	25	#endif
26	26
27		−#include "common/global.h"
28	27	#include "gpu/hwdec.h"
29	28	#include "gpu/video.h"
30	29	#include "mpv_talloc.h"

video/out/vo_gpu.c+0−1

@@ -30,7 +30,6 @@ · 29 unmodified lines
30	30	#include "common/common.h"
31	31	#include "misc/bstr.h"
32	32	#include "common/msg.h"
33		−#include "common/global.h"
34	33	#include "options/m_config.h"
35	34	#include "vo.h"
36	35	#include "video/mp_image.h"