# HG changeset patch
# User reimar
# Date 1257894657 0
# Node ID a05ba1fa78b6c564a851a4d84d1569c2eaeee18d
# Parent  ab281bcfecb973922144098ac2282500a261ee56
Share dvd_device extern declaration between dvd and dvdnav.

diff -r ab281bcfecb9 -r a05ba1fa78b6 stream/stream_dvd.c
--- a/stream/stream_dvd.c	Tue Nov 10 23:03:52 2009 +0000
+++ b/stream/stream_dvd.c	Tue Nov 10 23:10:57 2009 +0000
@@ -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 */
diff -r ab281bcfecb9 -r a05ba1fa78b6 stream/stream_dvd_common.h
--- a/stream/stream_dvd_common.h	Tue Nov 10 23:03:52 2009 +0000
+++ b/stream/stream_dvd_common.h	Tue Nov 10 23:10:57 2009 +0000
@@ -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 */
diff -r ab281bcfecb9 -r a05ba1fa78b6 stream/stream_dvdnav.c
--- a/stream/stream_dvdnav.c	Tue Nov 10 23:03:52 2009 +0000
+++ b/stream/stream_dvdnav.c	Tue Nov 10 23:10:57 2009 +0000
@@ -47,7 +47,6 @@
   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];