aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-01-01 17:01:03 +0000
committerGravatar nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-01-01 17:01:03 +0000
commitd37917abf5ee2e2d6c2f81d27af299513c764942 (patch)
tree13d555ffdc2522db64355df6419d6f643e83ac21
parentfba0b66ff9164bb0e386e47e6051d4ab29997fb5 (diff)
private structures belong to the C file using them, not to header files included somewhere else
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25564 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--stream/stream_dvdnav.c11
-rw-r--r--stream/stream_dvdnav.h11
2 files changed, 11 insertions, 11 deletions
diff --git a/stream/stream_dvdnav.c b/stream/stream_dvdnav.c
index aaf3c5a690..311b553737 100644
--- a/stream/stream_dvdnav.c
+++ b/stream/stream_dvdnav.c
@@ -10,6 +10,7 @@
#include "input/input.h"
#include "stream.h"
#include "libmpdemux/demuxer.h"
+#include <dvdnav.h>
#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 --git a/stream/stream_dvdnav.h b/stream/stream_dvdnav.h
index de4b5eb765..18e4784181 100644
--- a/stream/stream_dvdnav.h
+++ b/stream/stream_dvdnav.h
@@ -14,17 +14,6 @@ typedef struct {
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);