aboutsummaryrefslogtreecommitdiffhomepage
path: root/stream
diff options
context:
space:
mode:
authorGravatar reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-11-10 23:10:57 +0000
committerGravatar reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-11-10 23:10:57 +0000
commit8f164e07a00a82b2a7cde6b617c896e35e4ee9e1 (patch)
tree4863a03d0574b5fcad4858714b786af36c77d775 /stream
parent6e8f1e844f4f446369cc4ebc1abf362c37b3ebf2 (diff)
Share dvd_device extern declaration between dvd and dvdnav.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29887 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream')
-rw-r--r--stream/stream_dvd.c1
-rw-r--r--stream/stream_dvd_common.h1
-rw-r--r--stream/stream_dvdnav.c1
3 files changed, 1 insertions, 2 deletions
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];