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/cfg-mplayer.h | |
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/cfg-mplayer.h')
-rw-r--r-- | core/cfg-mplayer.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/cfg-mplayer.h b/core/cfg-mplayer.h index c0f4c91a9c..efb445cd68 100644 --- a/core/cfg-mplayer.h +++ b/core/cfg-mplayer.h @@ -26,13 +26,13 @@ #include <stddef.h> #include <sys/types.h> -#include "options.h" +#include "core/options.h" #include "config.h" -#include "m_config.h" -#include "m_option.h" +#include "core/m_config.h" +#include "core/m_option.h" #include "stream/tv.h" #include "stream/stream_radio.h" -#include "libvo/csputils.h" +#include "video/csputils.h" extern char *lirc_configfile; @@ -67,7 +67,7 @@ extern int reuse_socket; extern int dvd_speed; /* stream/stream_dvd.c */ -/* defined in libmpdemux: */ +/* defined in demux: */ extern const m_option_t demux_rawaudio_opts[]; extern const m_option_t demux_rawvideo_opts[]; extern const m_option_t cdda_opts[]; @@ -204,7 +204,7 @@ const m_option_t mfopts_conf[]={ {NULL, NULL, 0, 0, 0, 0, NULL} }; -#include "libaf/af.h" +#include "audio/filter/af.h" extern struct af_cfg af_cfg; // Audio filter configuration, defined in libmpcodecs/dec_audio.c const m_option_t audio_filter_conf[]={ {"list", &af_cfg.list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL}, |