diff options
author | wm4 <wm4@nowhere> | 2012-08-12 18:40:21 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2012-08-16 17:17:49 +0200 |
commit | 41fbcee1f557c3ddbfefc79b2b1b4719c6442265 (patch) | |
tree | 6c15b7631ad817a68207d2d04e4969ec0e128a8a /sub/sub.h | |
parent | aebfbbf2bdda8e18beef90c16da97bd335f7d3b0 (diff) | |
download | mpv-41fbcee1f557c3ddbfefc79b2b1b4719c6442265.tar.bz2 mpv-41fbcee1f557c3ddbfefc79b2b1b4719c6442265.tar.xz |
Remove dvdnav support (DVD menus)
When the internal mplayer MPEG demuxer was removed (commit 1fde09db),
the default demuxer when using dvdnav was set to libavformat. Now it
turns out that this doesn't work with libavformat. It will terminate
playback right after the audio runs out (instead of looping it like the
video, or whatever it's supposed to do). I'm not sure what exactly the
problem is, but since 1. even mplayer-svn can't handle DVD menus
directly (missing highlights), 2. DVD menus are essentially worthless,
and 3. I don't directly watch DVDs, don't bother with it and remove it.
For basic playback, there's still libdvdread support.
Also, use pkg-config for libdvdread, and drop support for in-tree
libdvdread. Remove support for in-tree libdvdcss as well.
Diffstat (limited to 'sub/sub.h')
-rw-r--r-- | sub/sub.h | 6 |
1 files changed, 0 insertions, 6 deletions
@@ -29,7 +29,6 @@ typedef struct mp_osd_bbox_s { #define OSDTYPE_SUBTITLE 2 #define OSDTYPE_PROGBAR 3 #define OSDTYPE_SPU 4 -#define OSDTYPE_DVDNAV 5 #define OSDFLAG_VISIBLE 1 #define OSDFLAG_CHANGED 2 @@ -173,11 +172,6 @@ void vo_osd_resized(void); int vo_osd_check_range_update(int,int,int,int); void osd_free(struct osd_state *osd); -#ifdef CONFIG_DVDNAV -#include <inttypes.h> -void osd_set_nav_box (uint16_t sx, uint16_t sy, uint16_t ex, uint16_t ey); -#endif - // used only by osd_ft.c or osd_libass.c void osd_alloc_buf(mp_osd_obj_t* obj); void vo_draw_text_from_buffer(mp_osd_obj_t* obj,void (*draw_alpha)(void *ctx, int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride), void *ctx); |