From 406241005e3d897b30a5b168a16ad61f0996c43c Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Tue, 6 Aug 2013 22:41:30 +0200 Subject: core: move contents to mpvcore (2/2) Followup commit. Fixes all the files references. --- sub/ass_mp.c | 6 +++--- sub/dec_sub.c | 6 +++--- sub/draw_bmp.c | 2 +- sub/find_subfiles.c | 8 ++++---- sub/osd_libass.c | 6 +++--- sub/sd_ass.c | 6 +++--- sub/sd_lavc.c | 6 +++--- sub/sd_lavc_conv.c | 6 +++--- sub/sd_lavf_srt.c | 2 +- sub/sd_microdvd.c | 4 ++-- sub/sd_spu.c | 2 +- sub/sd_srt.c | 4 ++-- sub/spudec.c | 4 ++-- sub/sub.c | 6 +++--- sub/sub.h | 2 +- 15 files changed, 35 insertions(+), 35 deletions(-) (limited to 'sub') diff --git a/sub/ass_mp.c b/sub/ass_mp.c index 5e87223041..df4e3f3146 100644 --- a/sub/ass_mp.c +++ b/sub/ass_mp.c @@ -30,12 +30,12 @@ #include #include "config.h" -#include "core/mp_msg.h" -#include "core/path.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/path.h" #include "ass_mp.h" #include "sub/sub.h" #include "stream/stream.h" -#include "core/options.h" +#include "mpvcore/options.h" // res_y should be track->PlayResY // It determines scaling of font sizes and more. diff --git a/sub/dec_sub.c b/sub/dec_sub.c index 4351cf60a0..8622d2c872 100644 --- a/sub/dec_sub.c +++ b/sub/dec_sub.c @@ -27,9 +27,9 @@ #include "sd.h" #include "sub.h" #include "dec_sub.h" -#include "core/options.h" -#include "core/mp_msg.h" -#include "core/charset_conv.h" +#include "mpvcore/options.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/charset_conv.h" extern const struct sd_functions sd_ass; extern const struct sd_functions sd_lavc; diff --git a/sub/draw_bmp.c b/sub/draw_bmp.c index 4615458f15..3dc46fb827 100644 --- a/sub/draw_bmp.c +++ b/sub/draw_bmp.c @@ -25,7 +25,7 @@ #include #include -#include "core/mp_common.h" +#include "mpvcore/mp_common.h" #include "sub/draw_bmp.h" #include "sub/sub.h" #include "sub/img_convert.h" diff --git a/sub/find_subfiles.c b/sub/find_subfiles.c index 3519e5c386..10098f6bda 100644 --- a/sub/find_subfiles.c +++ b/sub/find_subfiles.c @@ -6,10 +6,10 @@ #include "osdep/io.h" -#include "core/mp_msg.h" -#include "core/options.h" -#include "core/path.h" -#include "core/mp_common.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/options.h" +#include "mpvcore/path.h" +#include "mpvcore/mp_common.h" #include "sub/find_subfiles.h" #include "sub/sub.h" diff --git a/sub/osd_libass.c b/sub/osd_libass.c index fc4592ef99..eadb0e8da5 100644 --- a/sub/osd_libass.c +++ b/sub/osd_libass.c @@ -25,8 +25,8 @@ #include "config.h" #include "talloc.h" -#include "core/mp_common.h" -#include "core/mp_msg.h" +#include "mpvcore/mp_common.h" +#include "mpvcore/mp_msg.h" #include "sub.h" static const char osd_font_pfb[] = @@ -34,7 +34,7 @@ static const char osd_font_pfb[] = ; #include "sub/ass_mp.h" -#include "core/options.h" +#include "mpvcore/options.h" // NOTE: \fs-5 to reduce the size of the symbols in relation to normal text. diff --git a/sub/sd_ass.c b/sub/sd_ass.c index 7395f1bea6..81e1df8dec 100644 --- a/sub/sd_ass.c +++ b/sub/sd_ass.c @@ -25,9 +25,9 @@ #include "talloc.h" -#include "core/options.h" -#include "core/mp_common.h" -#include "core/mp_msg.h" +#include "mpvcore/options.h" +#include "mpvcore/mp_common.h" +#include "mpvcore/mp_msg.h" #include "video/csputils.h" #include "video/mp_image.h" #include "sub.h" diff --git a/sub/sd_lavc.c b/sub/sd_lavc.c index e39f537ba7..a906e72f10 100644 --- a/sub/sd_lavc.c +++ b/sub/sd_lavc.c @@ -22,9 +22,9 @@ #include #include "talloc.h" -#include "core/mp_msg.h" -#include "core/av_common.h" -#include "core/options.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/av_common.h" +#include "mpvcore/options.h" #include "demux/stheader.h" #include "sd.h" #include "dec_sub.h" diff --git a/sub/sd_lavc_conv.c b/sub/sd_lavc_conv.c index 4f24e20709..0c8160495c 100644 --- a/sub/sd_lavc_conv.c +++ b/sub/sd_lavc_conv.c @@ -25,9 +25,9 @@ #include "config.h" #include "talloc.h" -#include "core/mp_msg.h" -#include "core/av_common.h" -#include "core/bstr.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/av_common.h" +#include "mpvcore/bstr.h" #include "sd.h" struct sd_lavc_priv { diff --git a/sub/sd_lavf_srt.c b/sub/sd_lavf_srt.c index 0d34b489c7..3e2ebefab2 100644 --- a/sub/sd_lavf_srt.c +++ b/sub/sd_lavf_srt.c @@ -21,7 +21,7 @@ #include #include -#include "core/bstr.h" +#include "mpvcore/bstr.h" #include "sd.h" /* diff --git a/sub/sd_microdvd.c b/sub/sd_microdvd.c index 81c8ef92c8..c0e9fa1d61 100644 --- a/sub/sd_microdvd.c +++ b/sub/sd_microdvd.c @@ -27,8 +27,8 @@ #include #include -#include "core/mp_msg.h" -#include "core/bstr.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/bstr.h" #include "sd.h" struct line { diff --git a/sub/sd_spu.c b/sub/sd_spu.c index c6aed81641..52e2b728ed 100644 --- a/sub/sd_spu.c +++ b/sub/sd_spu.c @@ -19,7 +19,7 @@ #include #include "talloc.h" -#include "core/options.h" +#include "mpvcore/options.h" #include "demux/stheader.h" #include "sd.h" #include "sub.h" diff --git a/sub/sd_srt.c b/sub/sd_srt.c index b01c4dc3f8..f9d1a88c9f 100644 --- a/sub/sd_srt.c +++ b/sub/sd_srt.c @@ -27,8 +27,8 @@ #include #include -#include "core/mp_msg.h" -#include "core/bstr.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/bstr.h" #include "sd.h" struct line { diff --git a/sub/spudec.c b/sub/spudec.c index 07dbb3af07..56d7ca1eae 100644 --- a/sub/spudec.c +++ b/sub/spudec.c @@ -40,11 +40,11 @@ #include #include "config.h" -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "spudec.h" #include "sub.h" -#include "core/mp_common.h" +#include "mpvcore/mp_common.h" #include "video/csputils.h" typedef struct spu_packet_t packet_t; diff --git a/sub/sub.c b/sub/sub.c index f3feef3c88..a5ff9e2593 100644 --- a/sub/sub.c +++ b/sub/sub.c @@ -23,15 +23,15 @@ #include -#include "core/mp_common.h" +#include "mpvcore/mp_common.h" #include "stream/stream.h" #include "osdep/timer.h" #include "talloc.h" -#include "core/options.h" -#include "core/mp_msg.h" +#include "mpvcore/options.h" +#include "mpvcore/mp_msg.h" #include "sub.h" #include "dec_sub.h" #include "img_convert.h" diff --git a/sub/sub.h b/sub/sub.h index 4a636f0700..3cb140565c 100644 --- a/sub/sub.h +++ b/sub/sub.h @@ -23,7 +23,7 @@ #include #include -#include "core/m_option.h" +#include "mpvcore/m_option.h" // NOTE: VOs must support at least SUBBITMAP_RGBA. enum sub_bitmap_format { -- cgit v1.2.3