diff options
| author | wm4 <wm4@nowhere> | 2013-10-30 21:47:14 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-10-30 22:19:31 +0100 |
| commit | 2ccc3721ef9fc0acf39203e6709fa638a79222ae (patch) | |
| tree | b4e4ad1b44b0baa0f3ce7c9696213dcabce3699f /mpvcore/player/sub.c | |
| parent | fdd1b8cac13b7504e11db7e63f20d86e0f2e1cb2 (diff) | |
| download | mpv-2ccc3721ef9fc0acf39203e6709fa638a79222ae.tar.bz2 mpv-2ccc3721ef9fc0acf39203e6709fa638a79222ae.tar.xz | |
player: merge mp_osd.h into mp_core.h
Just doing this because mp_osd.h and osd.c is not consistent.
There are some other header files (command.h and screenshot.h), but
since I don't feel too good about inflating mp_core.h, I'm not merging
them, at least not yet.
Diffstat (limited to 'mpvcore/player/sub.c')
| -rw-r--r-- | mpvcore/player/sub.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mpvcore/player/sub.c b/mpvcore/player/sub.c index 42724486c9..d85abcc2c4 100644 --- a/mpvcore/player/sub.c +++ b/mpvcore/player/sub.c @@ -35,7 +35,6 @@ #include "video/mp_image.h" #include "mp_core.h" -#include "mp_osd.h" void uninit_subs(struct demuxer *demuxer) { |