diff options
Diffstat (limited to 'sub')
-rw-r--r-- | sub/ass_mp.c | 2 | ||||
-rw-r--r-- | sub/dec_sub.c | 1 | ||||
-rw-r--r-- | sub/dec_sub.h | 2 | ||||
-rw-r--r-- | sub/draw_bmp.c | 5 | ||||
-rw-r--r-- | sub/draw_bmp.h | 2 | ||||
-rw-r--r-- | sub/find_subfiles.c | 1 | ||||
-rw-r--r-- | sub/img_convert.c | 2 | ||||
-rw-r--r-- | sub/osd.c (renamed from sub/sub.c) | 2 | ||||
-rw-r--r-- | sub/osd.h (renamed from sub/sub.h) | 0 | ||||
-rw-r--r-- | sub/osd_dummy.c | 2 | ||||
-rw-r--r-- | sub/osd_libass.c | 2 | ||||
-rw-r--r-- | sub/sd_ass.c | 1 | ||||
-rw-r--r-- | sub/sd_lavc.c | 1 | ||||
-rw-r--r-- | sub/sd_spu.c | 1 | ||||
-rw-r--r-- | sub/spudec.c | 2 |
15 files changed, 10 insertions, 16 deletions
diff --git a/sub/ass_mp.c b/sub/ass_mp.c index ac36e2d954..33cd1559fc 100644 --- a/sub/ass_mp.c +++ b/sub/ass_mp.c @@ -33,7 +33,7 @@ #include "mpvcore/mp_msg.h" #include "mpvcore/path.h" #include "ass_mp.h" -#include "sub/sub.h" +#include "osd.h" #include "stream/stream.h" #include "mpvcore/options.h" diff --git a/sub/dec_sub.c b/sub/dec_sub.c index cb76acc248..425db1b3e8 100644 --- a/sub/dec_sub.c +++ b/sub/dec_sub.c @@ -25,7 +25,6 @@ #include "config.h" #include "demux/demux.h" #include "sd.h" -#include "sub.h" #include "dec_sub.h" #include "mpvcore/options.h" #include "mpvcore/mp_msg.h" diff --git a/sub/dec_sub.h b/sub/dec_sub.h index 9ff2b366bd..4fa62d7b97 100644 --- a/sub/dec_sub.h +++ b/sub/dec_sub.h @@ -4,7 +4,7 @@ #include <stdbool.h> #include <stdint.h> -#include "sub/sub.h" +#include "osd.h" struct sh_stream; struct ass_track; diff --git a/sub/draw_bmp.c b/sub/draw_bmp.c index 3dc46fb827..2b91befe50 100644 --- a/sub/draw_bmp.c +++ b/sub/draw_bmp.c @@ -26,9 +26,8 @@ #include <libavutil/common.h> #include "mpvcore/mp_common.h" -#include "sub/draw_bmp.h" -#include "sub/sub.h" -#include "sub/img_convert.h" +#include "draw_bmp.h" +#include "img_convert.h" #include "video/mp_image.h" #include "video/sws_utils.h" #include "video/img_format.h" diff --git a/sub/draw_bmp.h b/sub/draw_bmp.h index 489e91f666..9ccd764d5d 100644 --- a/sub/draw_bmp.h +++ b/sub/draw_bmp.h @@ -1,7 +1,7 @@ #ifndef MPLAYER_DRAW_BMP_H #define MPLAYER_DRAW_BMP_H -#include "sub/sub.h" +#include "osd.h" struct mp_image; struct sub_bitmaps; diff --git a/sub/find_subfiles.c b/sub/find_subfiles.c index a5b1bdeb22..fc55484c52 100644 --- a/sub/find_subfiles.c +++ b/sub/find_subfiles.c @@ -11,7 +11,6 @@ #include "mpvcore/path.h" #include "mpvcore/mp_common.h" #include "sub/find_subfiles.h" -#include "sub/sub.h" static const char *sub_exts[] = {"utf", "utf8", "utf-8", "idx", "sub", "srt", "smi", "rt", "txt", "ssa", "aqt", "jss", diff --git a/sub/img_convert.c b/sub/img_convert.c index 3ebe993c17..ce72f2c6d3 100644 --- a/sub/img_convert.c +++ b/sub/img_convert.c @@ -24,7 +24,7 @@ #include "talloc.h" #include "img_convert.h" -#include "sub.h" +#include "osd.h" #include "video/img_format.h" #include "video/mp_image.h" #include "video/sws_utils.h" @@ -32,7 +32,7 @@ #include "talloc.h" #include "mpvcore/options.h" #include "mpvcore/mp_msg.h" -#include "sub.h" +#include "osd.h" #include "dec_sub.h" #include "img_convert.h" #include "draw_bmp.h" diff --git a/sub/osd_dummy.c b/sub/osd_dummy.c index a330c63982..cc2ba37377 100644 --- a/sub/osd_dummy.c +++ b/sub/osd_dummy.c @@ -4,7 +4,7 @@ #include "config.h" #include "talloc.h" -#include "sub.h" +#include "osd.h" void osd_init_backend(struct osd_state *osd) { diff --git a/sub/osd_libass.c b/sub/osd_libass.c index 29db58f464..0564fbb4d3 100644 --- a/sub/osd_libass.c +++ b/sub/osd_libass.c @@ -27,7 +27,7 @@ #include "talloc.h" #include "mpvcore/mp_common.h" #include "mpvcore/mp_msg.h" -#include "sub.h" +#include "osd.h" static const char osd_font_pfb[] = #include "sub/osd_font.h" diff --git a/sub/sd_ass.c b/sub/sd_ass.c index fd545cdbda..631c81a083 100644 --- a/sub/sd_ass.c +++ b/sub/sd_ass.c @@ -30,7 +30,6 @@ #include "mpvcore/mp_msg.h" #include "video/csputils.h" #include "video/mp_image.h" -#include "sub.h" #include "dec_sub.h" #include "ass_mp.h" #include "sd.h" diff --git a/sub/sd_lavc.c b/sub/sd_lavc.c index 683436eb2a..9741b0de70 100644 --- a/sub/sd_lavc.c +++ b/sub/sd_lavc.c @@ -28,7 +28,6 @@ #include "video/mp_image.h" #include "sd.h" #include "dec_sub.h" -#include "sub.h" struct sd_lavc_priv { AVCodecContext *avctx; diff --git a/sub/sd_spu.c b/sub/sd_spu.c index 0061ec81e3..15ea351159 100644 --- a/sub/sd_spu.c +++ b/sub/sd_spu.c @@ -22,7 +22,6 @@ #include "mpvcore/options.h" #include "video/mp_image.h" #include "sd.h" -#include "sub.h" #include "spudec.h" struct sd_spu_priv { diff --git a/sub/spudec.c b/sub/spudec.c index 5d58b3664c..5a2c094be9 100644 --- a/sub/spudec.c +++ b/sub/spudec.c @@ -43,7 +43,7 @@ #include "mpvcore/mp_msg.h" #include "spudec.h" -#include "sub.h" +#include "osd.h" #include "mpvcore/mp_common.h" #include "video/csputils.h" |