From 8f164e07a00a82b2a7cde6b617c896e35e4ee9e1 Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Tue, 10 Nov 2009 23:10:57 +0000
Subject: Share dvd_device extern declaration between dvd and dvdnav.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29887 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 stream/stream_dvd.c        | 1 -
 stream/stream_dvd_common.h | 1 +
 stream/stream_dvdnav.c     | 1 -
 3 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'stream')

diff --git a/stream/stream_dvd.c b/stream/stream_dvd.c
index 4047e84080..d19ce1ce5e 100644
--- a/stream/stream_dvd.c
+++ b/stream/stream_dvd.c
@@ -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 --git a/stream/stream_dvd_common.h b/stream/stream_dvd_common.h
index 906ae02ba6..8eb1aa8d60 100644
--- a/stream/stream_dvd_common.h
+++ b/stream/stream_dvd_common.h
@@ -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 --git a/stream/stream_dvdnav.c b/stream/stream_dvdnav.c
index 274360c6ab..3f07255fa4 100644
--- a/stream/stream_dvdnav.c
+++ b/stream/stream_dvdnav.c
@@ -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];
 
-- 
cgit v1.2.3