diff options
author | wm4 <wm4@nowhere> | 2012-11-09 01:06:43 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2012-11-12 20:08:18 +0100 |
commit | 4873b32c5959c988af1769529ff72e3fd62fba82 (patch) | |
tree | e18fbd7eef54de6071969689aa5c31d6ea1f0963 /core/timeline | |
parent | d4bdd0473d6f43132257c9fb3848d829755167a3 (diff) | |
download | mpv-4873b32c5959c988af1769529ff72e3fd62fba82.tar.bz2 mpv-4873b32c5959c988af1769529ff72e3fd62fba82.tar.xz |
Rename directories, move files (step 2 of 2)
Finish renaming directories and moving files. Adjust all include
statements to make the previous commit compile.
The two commits are separate, because git is bad at tracking renames
and content changes at the same time.
Also take this as an opportunity to remove the separation between
"common" and "mplayer" sources in the Makefile. ("common" used to be
shared between mplayer and mencoder.)
Diffstat (limited to 'core/timeline')
-rw-r--r-- | core/timeline/tl_cue.c | 12 | ||||
-rw-r--r-- | core/timeline/tl_edl.c | 12 | ||||
-rw-r--r-- | core/timeline/tl_matroska.c | 12 |
3 files changed, 18 insertions, 18 deletions
diff --git a/core/timeline/tl_cue.c b/core/timeline/tl_cue.c index cfc67bdd84..d9160e0b8e 100644 --- a/core/timeline/tl_cue.c +++ b/core/timeline/tl_cue.c @@ -24,12 +24,12 @@ #include "talloc.h" -#include "mp_core.h" -#include "mp_msg.h" -#include "libmpdemux/demuxer.h" -#include "path.h" -#include "bstr.h" -#include "mpcommon.h" +#include "core/mp_core.h" +#include "core/mp_msg.h" +#include "demux/demux.h" +#include "core/path.h" +#include "core/bstr.h" +#include "core/mp_common.h" #include "stream/stream.h" // used by demuxer_cue.c diff --git a/core/timeline/tl_edl.c b/core/timeline/tl_edl.c index 3c8cd21781..1af36a54f8 100644 --- a/core/timeline/tl_edl.c +++ b/core/timeline/tl_edl.c @@ -23,12 +23,12 @@ #include "talloc.h" -#include "mp_core.h" -#include "mp_msg.h" -#include "libmpdemux/demuxer.h" -#include "path.h" -#include "bstr.h" -#include "mpcommon.h" +#include "core/mp_core.h" +#include "core/mp_msg.h" +#include "demux/demux.h" +#include "core/path.h" +#include "core/bstr.h" +#include "core/mp_common.h" #include "stream/stream.h" diff --git a/core/timeline/tl_matroska.c b/core/timeline/tl_matroska.c index 9387201866..a87889edd8 100644 --- a/core/timeline/tl_matroska.c +++ b/core/timeline/tl_matroska.c @@ -30,12 +30,12 @@ #include "talloc.h" -#include "mp_core.h" -#include "mp_msg.h" -#include "libmpdemux/demuxer.h" -#include "path.h" -#include "bstr.h" -#include "mpcommon.h" +#include "core/mp_core.h" +#include "core/mp_msg.h" +#include "demux/demux.h" +#include "core/path.h" +#include "core/bstr.h" +#include "core/mp_common.h" #include "stream/stream.h" struct find_entry { |