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. --- demux/codec_tags.c | 2 +- demux/demux.c | 6 +++--- demux/demux.h | 4 ++-- demux/demux_cue.c | 2 +- demux/demux_lavf.c | 12 ++++++------ demux/demux_libass.c | 6 +++--- demux/demux_mf.c | 2 +- demux/demux_mkv.c | 6 +++--- demux/demux_mng.c | 2 +- demux/demux_raw.c | 2 +- demux/demux_subreader.c | 6 +++--- demux/ebml.c | 2 +- demux/ebml.h | 2 +- demux/mf.c | 4 ++-- 14 files changed, 29 insertions(+), 29 deletions(-) (limited to 'demux') diff --git a/demux/codec_tags.c b/demux/codec_tags.c index cf7e0356be..63564e7c7d 100644 --- a/demux/codec_tags.c +++ b/demux/codec_tags.c @@ -20,7 +20,7 @@ #include #include "codec_tags.h" #include "stheader.h" -#include "core/av_common.h" +#include "mpvcore/av_common.h" /* The following tables map FourCCs to codec names (as defined by libavcodec). * However, this includes only names that are not defined by libavformat's diff --git a/demux/demux.c b/demux/demux.c index 873821f250..3a8f8972d5 100644 --- a/demux/demux.c +++ b/demux/demux.c @@ -29,10 +29,10 @@ #include #include "config.h" -#include "core/options.h" -#include "core/av_common.h" +#include "mpvcore/options.h" +#include "mpvcore/av_common.h" #include "talloc.h" -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "stream/stream.h" #include "demux.h" diff --git a/demux/demux.h b/demux/demux.h index 4afd85f4a7..9337b76100 100644 --- a/demux/demux.h +++ b/demux/demux.h @@ -25,8 +25,8 @@ #include #include -#include "core/bstr.h" -#include "core/mp_common.h" +#include "mpvcore/bstr.h" +#include "mpvcore/mp_common.h" #include "demux_packet.h" #include "stheader.h" diff --git a/demux/demux_cue.c b/demux/demux_cue.c index 4d2c03dcce..7c94850899 100644 --- a/demux/demux_cue.c +++ b/demux/demux_cue.c @@ -22,7 +22,7 @@ #include #include -#include "core/bstr.h" +#include "mpvcore/bstr.h" #include "demux.h" #include "stream/stream.h" diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c index 1654562bd9..9a148c4a1e 100644 --- a/demux/demux_lavf.c +++ b/demux/demux_lavf.c @@ -35,16 +35,16 @@ #include "compat/libav.h" #include "config.h" -#include "core/options.h" -#include "core/mp_msg.h" -#include "core/av_opts.h" -#include "core/av_common.h" -#include "core/bstr.h" +#include "mpvcore/options.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/av_opts.h" +#include "mpvcore/av_common.h" +#include "mpvcore/bstr.h" #include "stream/stream.h" #include "demux.h" #include "stheader.h" -#include "core/m_option.h" +#include "mpvcore/m_option.h" #define INITIAL_PROBE_SIZE STREAM_BUFFER_SIZE #define PROBE_BUF_SIZE FFMIN(STREAM_MAX_BUFFER_SIZE, 2 * 1024 * 1024) diff --git a/demux/demux_libass.c b/demux/demux_libass.c index fc30f1dce5..d98cdbb5a4 100644 --- a/demux/demux_libass.c +++ b/demux/demux_libass.c @@ -21,9 +21,9 @@ #include #include -#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" #include "stream/stream.h" #include "demux.h" diff --git a/demux/demux_mf.c b/demux/demux_mf.c index 7c4b83692d..9c2f8fb19c 100644 --- a/demux/demux_mf.c +++ b/demux/demux_mf.c @@ -27,7 +27,7 @@ #include "talloc.h" #include "config.h" -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "stream/stream.h" #include "demux.h" diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c index cc84565a60..9fc1c6f0bb 100644 --- a/demux/demux_mkv.c +++ b/demux/demux_mkv.c @@ -42,8 +42,8 @@ #endif #include "talloc.h" -#include "core/options.h" -#include "core/bstr.h" +#include "mpvcore/options.h" +#include "mpvcore/bstr.h" #include "stream/stream.h" #include "demux.h" #include "stheader.h" @@ -51,7 +51,7 @@ #include "matroska.h" #include "codec_tags.h" -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" static const unsigned char sipr_swaps[38][2] = { {0,63},{1,22},{2,44},{3,90},{5,81},{7,31},{8,86},{9,58},{10,36},{12,68}, diff --git a/demux/demux_mng.c b/demux/demux_mng.c index f6cb66302c..1342e51469 100644 --- a/demux/demux_mng.c +++ b/demux/demux_mng.c @@ -26,7 +26,7 @@ #include "config.h" -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "stream/stream.h" #include "demux.h" diff --git a/demux/demux_raw.c b/demux/demux_raw.c index 4b3e8844a4..532a2b5cce 100644 --- a/demux/demux_raw.c +++ b/demux/demux_raw.c @@ -23,7 +23,7 @@ #include #include -#include "core/m_option.h" +#include "mpvcore/m_option.h" #include "stream/stream.h" #include "demux.h" diff --git a/demux/demux_subreader.c b/demux/demux_subreader.c index 26fdfcb971..1448b52276 100644 --- a/demux/demux_subreader.c +++ b/demux/demux_subreader.c @@ -32,9 +32,9 @@ #include #include "config.h" -#include "core/mp_msg.h" -#include "core/mp_common.h" -#include "core/options.h" +#include "mpvcore/mp_msg.h" +#include "mpvcore/mp_common.h" +#include "mpvcore/options.h" #include "stream/stream.h" #include "demux/demux.h" diff --git a/demux/ebml.c b/demux/ebml.c index 2314121f5e..06ef85b742 100644 --- a/demux/ebml.c +++ b/demux/ebml.c @@ -35,7 +35,7 @@ #include "ebml.h" #include "stream/stream.h" #include "compat/mpbswap.h" -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #ifndef SIZE_MAX #define SIZE_MAX ((size_t)-1) diff --git a/demux/ebml.h b/demux/ebml.h index 3f8bad0f92..715e9ff85d 100644 --- a/demux/ebml.h +++ b/demux/ebml.h @@ -24,7 +24,7 @@ #include #include "stream/stream.h" -#include "core/bstr.h" +#include "mpvcore/bstr.h" /* EBML version supported */ diff --git a/demux/mf.c b/demux/mf.c index 726bc8f394..8682e846bf 100644 --- a/demux/mf.c +++ b/demux/mf.c @@ -36,9 +36,9 @@ #include "osdep/glob.h" #endif -#include "core/mp_msg.h" +#include "mpvcore/mp_msg.h" #include "stream/stream.h" -#include "core/path.h" +#include "mpvcore/path.h" #include "mf.h" -- cgit v1.2.3