[MPlayer-cvslog] r29887 - in trunk/stream: stream_dvd.c stream_dvd_common.h stream_dvdnav.c

[reimar]

Author: reimar
Date: Wed Nov 11 00:10:57 2009
New Revision: 29887

Log:
Share dvd_device extern declaration between dvd and dvdnav.

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

Modified: trunk/stream/stream_dvd.c
==============================================================================
--- trunk/stream/stream_dvd.c	Wed Nov 11 00:03:52 2009	(r29886)
+++ trunk/stream/stream_dvd.c	Wed Nov 11 00:10:57 2009	(r29887)
@@ -41,7 +41,6 @@
 #include "libmpdemux/demuxer.h"
 #include "libavutil/intreadwrite.h"
 
-extern char* dvd_device;
 static char* dvd_device_current;
 int dvd_angle=1;
 int dvd_speed=0; /* 0 => don't touch speed */

Modified: trunk/stream/stream_dvd_common.h
==============================================================================
--- trunk/stream/stream_dvd_common.h	Wed Nov 11 00:03:52 2009	(r29886)
+++ trunk/stream/stream_dvd_common.h	Wed Nov 11 00:10:57 2009	(r29887)
@@ -5,6 +5,7 @@
 #include <inttypes.h>
 #include <dvdread/ifo_types.h>
 
+extern char *dvd_device;
 int mp_dvdtimetomsec(dvd_time_t *dt);
 
 #endif /* MPLAYER_STREAM_DVD_COMMON_H */

Modified: trunk/stream/stream_dvdnav.c
==============================================================================
--- trunk/stream/stream_dvdnav.c	Wed Nov 11 00:03:52 2009	(r29886)
+++ trunk/stream/stream_dvdnav.c	Wed Nov 11 00:10:57 2009	(r29887)
@@ -47,7 +47,6 @@ typedef struct {
   unsigned int     state;
 } dvdnav_priv_t;
 
-extern char *dvd_device;
 extern char *audio_lang, *dvdsub_lang;
 extern char *dvd_audio_stream_channels[6], *dvd_audio_stream_types[8];