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 /sub/osd_libass.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 'sub/osd_libass.c')
-rw-r--r-- | sub/osd_libass.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sub/osd_libass.c b/sub/osd_libass.c index 11173dad7a..8e7d766024 100644 --- a/sub/osd_libass.c +++ b/sub/osd_libass.c @@ -23,7 +23,7 @@ #include "config.h" #include "talloc.h" -#include "mp_msg.h" +#include "core/mp_msg.h" #include "sub.h" #include "libavutil/common.h" @@ -32,7 +32,7 @@ static const char osd_font_pfb[] = ; #include "sub/ass_mp.h" -#include "mp_core.h" +#include "core/mp_core.h" // NOTE: \fs-5 to reduce the size of the symbols in relation to normal text. |