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/input/input.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'core/input/input.c') diff --git a/core/input/input.c b/core/input/input.c index 6643747e4d..115d181e69 100644 --- a/core/input/input.c +++ b/core/input/input.c @@ -34,18 +34,18 @@ #include "osdep/io.h" #include "input.h" -#include "mp_fifo.h" +#include "core/mp_fifo.h" #include "keycodes.h" #include "osdep/timer.h" #include "libavutil/avstring.h" #include "libavutil/common.h" -#include "mp_msg.h" -#include "m_config.h" -#include "m_option.h" -#include "path.h" +#include "core/mp_msg.h" +#include "core/m_config.h" +#include "core/m_option.h" +#include "core/path.h" #include "talloc.h" -#include "options.h" -#include "bstr.h" +#include "core/options.h" +#include "core/bstr.h" #include "stream/stream.h" #include "joystick.h" @@ -545,7 +545,7 @@ static const m_option_t mp_input_opts[] = { static int default_cmd_func(int fd, char *buf, int l); static const char builtin_input_conf[] = -#include "input/input_conf.h" +#include "core/input/input_conf.h" ; // Encode the unicode codepoint as UTF-8, and append to the end of the -- cgit v1.2.3