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 /demux/demux_mng.c | |
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 'demux/demux_mng.c')
-rw-r--r-- | demux/demux_mng.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/demux/demux_mng.c b/demux/demux_mng.c index ad08ba8c4b..1d21d9d218 100644 --- a/demux/demux_mng.c +++ b/demux/demux_mng.c @@ -26,12 +26,12 @@ #include "config.h" -#include "mp_msg.h" +#include "core/mp_msg.h" #include "stream/stream.h" -#include "demuxer.h" +#include "demux.h" #include "stheader.h" -#include "libmpcodecs/img_format.h" +#include "video/img_format.h" #define MNG_SUPPORT_READ #define MNG_SUPPORT_DISPLAY |