[MPlayer-cvslog] r25564 - in trunk/stream: stream_dvdnav.c stream_dvdnav.h

[nicodvb]

Author: nicodvb
Date: Tue Jan  1 18:01:03 2008
New Revision: 25564

Log:
private structures belong to the C file using them, not to header files included somewhere else

Modified:
   trunk/stream/stream_dvdnav.c
   trunk/stream/stream_dvdnav.h

Modified: trunk/stream/stream_dvdnav.c
==============================================================================
--- trunk/stream/stream_dvdnav.c	(original)
+++ trunk/stream/stream_dvdnav.c	Tue Jan  1 18:01:03 2008
@@ -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;

Modified: trunk/stream/stream_dvdnav.h
==============================================================================
--- trunk/stream/stream_dvdnav.h	(original)
+++ trunk/stream/stream_dvdnav.h	Tue Jan  1 18:01:03 2008
@@ -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);