Unified · Split
| @@ -33,7 +33,6 @@ · 32 unmodified lines | |||
| 33 | #include "audio/fmt-conversion.h" | 33 | #include "audio/fmt-conversion.h" |
| 34 | #include "common/av_common.h" | 34 | #include "common/av_common.h" |
| 35 | #include "common/codecs.h" | 35 | #include "common/codecs.h" |
| 36 | #include "common/global.h" | ||
| 37 | #include "common/msg.h" | 36 | #include "common/msg.h" |
| 38 | #include "demux/packet.h" | 37 | #include "demux/packet.h" |
| 39 | #include "demux/stheader.h" | 38 | #include "demux/stheader.h" |
| @@ -27,7 +27,6 @@ · 26 unmodified lines | |||
| 27 | #include "libmpv/client.h" | 27 | #include "libmpv/client.h" |
| 28 | 28 | ||
| 29 | #include "common/common.h" | 29 | #include "common/common.h" |
| 30 | #include "common/global.h" | ||
| 31 | #include "common/msg_control.h" | 30 | #include "common/msg_control.h" |
| 32 | #include "common/msg.h" | 31 | #include "common/msg.h" |
| 33 | #include "m_config_frontend.h" | 32 | #include "m_config_frontend.h" |
| @@ -23,7 +23,6 @@ · 22 unmodified lines | |||
| 23 | #include <stdint.h> | 23 | #include <stdint.h> |
| 24 | 24 | ||
| 25 | #include "common/common.h" | 25 | #include "common/common.h" |
| 26 | #include "common/global.h" | ||
| 27 | #include "common/msg.h" | 26 | #include "common/msg.h" |
| 28 | #include "common/msg_control.h" | 27 | #include "common/msg_control.h" |
| 29 | #include "m_config_core.h" | 28 | #include "m_config_core.h" |
| @@ -23,7 +23,6 @@ · 22 unmodified lines | |||
| 23 | #include <stdbool.h> | 23 | #include <stdbool.h> |
| 24 | 24 | ||
| 25 | #include "osdep/io.h" | 25 | #include "osdep/io.h" |
| 26 | #include "common/global.h" | ||
| 27 | #include "common/msg.h" | 26 | #include "common/msg.h" |
| 28 | #include "common/msg_control.h" | 27 | #include "common/msg_control.h" |
| 29 | #include "m_option.h" | 28 | #include "m_option.h" |
| @@ -26,7 +26,6 @@ · 25 unmodified lines | |||
| 26 | #include "common/global.h" | 26 | #include "common/global.h" |
| 27 | #include "common/msg.h" | 27 | #include "common/msg.h" |
| 28 | #include "common/msg_control.h" | 28 | #include "common/msg_control.h" |
| 29 | #include "common/global.h" | ||
| 30 | #include "input/input.h" | 29 | #include "input/input.h" |
| 31 | #include "input/cmd.h" | 30 | #include "input/cmd.h" |
| 32 | #include "misc/ctype.h" | 31 | #include "misc/ctype.h" |
| @@ -34,7 +34,6 @@ · 33 unmodified lines | |||
| 34 | 34 | ||
| 35 | #include "osdep/io.h" | 35 | #include "osdep/io.h" |
| 36 | 36 | ||
| 37 | #include "common/global.h" | ||
| 38 | #include "common/encode.h" | 37 | #include "common/encode.h" |
| 39 | #include "common/msg.h" | 38 | #include "common/msg.h" |
| 40 | #include "misc/ctype.h" | 39 | #include "misc/ctype.h" |
| @@ -34,7 +34,6 @@ · 33 unmodified lines | |||
| 34 | #include "client.h" | 34 | #include "client.h" |
| 35 | #include "common/msg.h" | 35 | #include "common/msg.h" |
| 36 | #include "common/msg_control.h" | 36 | #include "common/msg_control.h" |
| 37 | #include "common/global.h" | ||
| 38 | #include "options/path.h" | 37 | #include "options/path.h" |
| 39 | #include "options/m_config.h" | 38 | #include "options/m_config.h" |
| 40 | #include "options/parse_configfile.h" | 39 | #include "options/parse_configfile.h" |
| @@ -32,7 +32,6 @@ · 31 unmodified lines | |||
| 32 | #include "options/m_property.h" | 32 | #include "options/m_property.h" |
| 33 | #include "options/m_config.h" | 33 | #include "options/m_config.h" |
| 34 | #include "common/common.h" | 34 | #include "common/common.h" |
| 35 | #include "common/global.h" | ||
| 36 | #include "common/encode.h" | 35 | #include "common/encode.h" |
| 37 | #include "common/playlist.h" | 36 | #include "common/playlist.h" |
| 38 | #include "input/input.h" | 37 | #include "input/input.h" |
| @@ -21,7 +21,6 @@ · 20 unmodified lines | |||
| 21 | 21 | ||
| 22 | #include <libavcodec/avcodec.h> | 22 | #include <libavcodec/avcodec.h> |
| 23 | 23 | ||
| 24 | #include "common/global.h" | ||
| 25 | #include "osdep/io.h" | 24 | #include "osdep/io.h" |
| 26 | 25 | ||
| 27 | #include "mpv_talloc.h" | 26 | #include "mpv_talloc.h" |
| @@ -26,7 +26,6 @@ · 25 unmodified lines | |||
| 26 | #include "common/msg.h" | 26 | #include "common/msg.h" |
| 27 | #include "options/options.h" | 27 | #include "options/options.h" |
| 28 | #include "common/common.h" | 28 | #include "common/common.h" |
| 29 | #include "common/global.h" | ||
| 30 | 29 | ||
| 31 | #include "stream/stream.h" | 30 | #include "stream/stream.h" |
| 32 | #include "sub/dec_sub.h" | 31 | #include "sub/dec_sub.h" |
| @@ -8,7 +8,6 @@ · 7 unmodified lines | |||
| 8 | 8 | ||
| 9 | #include "common/common.h" | 9 | #include "common/common.h" |
| 10 | #include "common/msg.h" | 10 | #include "common/msg.h" |
| 11 | #include "common/global.h" | ||
| 12 | #include "stream.h" | 11 | #include "stream.h" |
| 13 | #include "options/m_option.h" | 12 | #include "options/m_option.h" |
| 14 | #include "options/path.h" | 13 | #include "options/path.h" |
| @@ -29,7 +29,6 @@ · 28 unmodified lines | |||
| 29 | #include <ass/ass_types.h> | 29 | #include <ass/ass_types.h> |
| 30 | 30 | ||
| 31 | #include "common/common.h" | 31 | #include "common/common.h" |
| 32 | #include "common/global.h" | ||
| 33 | #include "common/msg.h" | 32 | #include "common/msg.h" |
| 34 | #include "options/path.h" | 33 | #include "options/path.h" |
| 35 | #include "ass_mp.h" | 34 | #include "ass_mp.h" |
| @@ -3,7 +3,6 @@ · 2 unmodified lines | |||
| 3 | #include <libavutil/pixfmt.h> | 3 | #include <libavutil/pixfmt.h> |
| 4 | 4 | ||
| 5 | #include "common/common.h" | 5 | #include "common/common.h" |
| 6 | #include "common/global.h" | ||
| 7 | #include "img_utils.h" | 6 | #include "img_utils.h" |
| 8 | #include "sub/draw_bmp.h" | 7 | #include "sub/draw_bmp.h" |
| 9 | #include "sub/osd.h" | 8 | #include "sub/osd.h" |
| @@ -30,7 +30,6 @@ · 29 unmodified lines | |||
| 30 | #include <libavutil/pixdesc.h> | 30 | #include <libavutil/pixdesc.h> |
| 31 | 31 | ||
| 32 | #include "mpv_talloc.h" | 32 | #include "mpv_talloc.h" |
| 33 | #include "common/global.h" | ||
| 34 | #include "common/msg.h" | 33 | #include "common/msg.h" |
| 35 | #include "options/m_config.h" | 34 | #include "options/m_config.h" |
| 36 | #include "options/options.h" | 35 | #include "options/options.h" |
| @@ -18,7 +18,8 @@ · 17 unmodified lines | |||
| 18 | #pragma once | 18 | #pragma once |
| 19 | 19 | ||
| 20 | #include "common/common.h" | 20 | #include "common/common.h" |
| 21 | #include "common/global.h" | 21 | |
| 22 | struct mpv_global; | ||
| 22 | 23 | ||
| 23 | struct offscreen_ctx { | 24 | struct offscreen_ctx { |
| 24 | struct mp_log *log; | 25 | struct mp_log *log; |
| @@ -30,7 +30,6 @@ · 29 unmodified lines | |||
| 30 | #include "misc/bstr.h" | 30 | #include "misc/bstr.h" |
| 31 | #include "options/m_config.h" | 31 | #include "options/m_config.h" |
| 32 | #include "options/path.h" | 32 | #include "options/path.h" |
| 33 | #include "common/global.h" | ||
| 34 | #include "options/options.h" | 33 | #include "options/options.h" |
| 35 | #include "utils.h" | 34 | #include "utils.h" |
| 36 | #include "hwdec.h" | 35 | #include "hwdec.h" |
| @@ -1,6 +1,5 @@ | |||
| 1 | #pragma once | 1 | #pragma once |
| 2 | 2 | ||
| 3 | #include "common/global.h" | ||
| 4 | #include "video/out/gpu/context.h" | 3 | #include "video/out/gpu/context.h" |
| 5 | #include "common.h" | 4 | #include "common.h" |
| 6 | 5 | ||
| @@ -24,7 +24,6 @@ · 23 unmodified lines | |||
| 24 | #include <va/va_drmcommon.h> | 24 | #include <va/va_drmcommon.h> |
| 25 | #endif | 25 | #endif |
| 26 | 26 | ||
| 27 | #include "common/global.h" | ||
| 28 | #include "gpu/hwdec.h" | 27 | #include "gpu/hwdec.h" |
| 29 | #include "gpu/video.h" | 28 | #include "gpu/video.h" |
| 30 | #include "mpv_talloc.h" | 29 | #include "mpv_talloc.h" |
| @@ -30,7 +30,6 @@ · 29 unmodified lines | |||
| 30 | #include "common/common.h" | 30 | #include "common/common.h" |
| 31 | #include "misc/bstr.h" | 31 | #include "misc/bstr.h" |
| 32 | #include "common/msg.h" | 32 | #include "common/msg.h" |
| 33 | #include "common/global.h" | ||
| 34 | #include "options/m_config.h" | 33 | #include "options/m_config.h" |
| 35 | #include "vo.h" | 34 | #include "vo.h" |
| 36 | #include "video/mp_image.h" | 35 | #include "video/mp_image.h" |