diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-02-04 00:28:17 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-02-04 00:28:17 +0200 |
| commit | 9790f4e6e72cdc8093be966d3d6e007c8f44a035 (patch) | |
| tree | 3d4a19a910d34be6ee7cd4841876a4318d5c243d /libvo/sub.c | |
| parent | ccf4d9e96cd7aa8506e6632d2a7352ec89b2b9e3 (diff) | |
| parent | 09bf506c34a73d587c999ce161a0714159e1e5b6 (diff) | |
| download | mpv-9790f4e6e72cdc8093be966d3d6e007c8f44a035.tar.bz2 mpv-9790f4e6e72cdc8093be966d3d6e007c8f44a035.tar.xz | |
Merge svn changes up to r28461
Diffstat (limited to 'libvo/sub.c')
| -rw-r--r-- | libvo/sub.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libvo/sub.c b/libvo/sub.c index 369d1bbd50..d4efcb9a5c 100644 --- a/libvo/sub.c +++ b/libvo/sub.c @@ -8,16 +8,12 @@ #include <malloc.h> #endif -#ifdef CONFIG_DVDNAV #include "stream/stream.h" #include "stream/stream_dvdnav.h" #define OSD_NAV_BOX_ALPHA 0x7f -#endif -#ifdef CONFIG_TV_TELETEXT #include "stream/tv.h" #include "osdep/timer.h" -#endif #include "talloc.h" #include "mplayer.h" |