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.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.c')
| -rw-r--r-- | demux/demux.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/demux/demux.c b/demux/demux.c index 3673fd06e3..889fbea409 100644 --- a/demux/demux.c +++ b/demux/demux.c @@ -28,17 +28,16 @@ #include <sys/stat.h> #include "config.h" -#include "options.h" +#include "core/options.h" #include "talloc.h" -#include "mp_msg.h" -#include "m_config.h" +#include "core/mp_msg.h" #include "stream/stream.h" -#include "demuxer.h" +#include "demux.h" #include "stheader.h" #include "mf.h" -#include "libaf/format.h" +#include "audio/format.h" #include "libavcodec/avcodec.h" #if MP_INPUT_BUFFER_PADDING_SIZE < FF_INPUT_BUFFER_PADDING_SIZE |