From 4873b32c5959c988af1769529ff72e3fd62fba82 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 9 Nov 2012 01:06:43 +0100 Subject: 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.) --- core/timeline/tl_cue.c | 12 ++++++------ core/timeline/tl_edl.c | 12 ++++++------ core/timeline/tl_matroska.c | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) (limited to 'core/timeline') 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 { -- cgit v1.2.3