# HG changeset patch # User nicodvb # Date 1199206863 0 # Node ID a7eec00ebb9c29a403c0c162026994ad05b65472 # Parent 3baf6a2283da2e15a617c48863374d68dff2d80f private structures belong to the C file using them, not to header files included somewhere else diff -r 3baf6a2283da -r a7eec00ebb9c stream/stream_dvdnav.c --- a/stream/stream_dvdnav.c Mon Dec 31 16:15:50 2007 +0000 +++ b/stream/stream_dvdnav.c Tue Jan 01 17:01:03 2008 +0000 @@ -10,6 +10,7 @@ #include "input/input.h" #include "stream.h" #include "libmpdemux/demuxer.h" +#include #include "stream_dvdnav.h" #include "libvo/video_out.h" #include "libavutil/common.h" @@ -18,6 +19,16 @@ #include "m_struct.h" #include "help_mp.h" +typedef struct { + dvdnav_t * dvdnav; /* handle to libdvdnav stuff */ + char * filename; /* path */ + unsigned int duration; /* in milliseconds */ + int mousex, mousey; + int title; + unsigned int spu_clut[16], spu_set; + dvdnav_highlight_event_t hlev; +} dvdnav_priv_t; + extern char *dvd_device; extern int dvd_chapter; extern int dvd_last_chapter; diff -r 3baf6a2283da -r a7eec00ebb9c stream/stream_dvdnav.h --- a/stream/stream_dvdnav.h Mon Dec 31 16:15:50 2007 +0000 +++ b/stream/stream_dvdnav.h Tue Jan 01 17:01:03 2008 +0000 @@ -14,17 +14,6 @@ uint16_t ex, ey; } nav_highlight_t; -typedef struct { - dvdnav_t * dvdnav; /* handle to libdvdnav stuff */ - char * filename; /* path */ - unsigned int duration; /* in milliseconds */ - int mousex, mousey; - int title; - unsigned int spu_clut[16], spu_set; - dvdnav_highlight_event_t hlev; -} dvdnav_priv_t; - - int dvdnav_number_of_subs(stream_t *stream); int dvdnav_aid_from_lang(stream_t *stream, unsigned char *language); int dvdnav_lang_from_aid(stream_t *stream, int id, unsigned char *buf);