summaryrefslogtreecommitdiffstats
path: root/stream
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-11-10 23:15:48 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-11-10 23:15:48 +0000
commit36ec82183681b5c751026e2c2d121cb4bd5bc87b (patch)
treeec7f90f4879ff082b050ef984d32344db6eb4069 /stream
parent80217b424035375d5887f1da7cacd2b1c242f63c (diff)
downloadmpv-36ec82183681b5c751026e2c2d121cb4bd5bc87b.tar.bz2
mpv-36ec82183681b5c751026e2c2d121cb4bd5bc87b.tar.xz
Move arrays used by both dvd and dvdnav to dvd_common.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29889 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream')
-rw-r--r--stream/stream_dvd.c3
-rw-r--r--stream/stream_dvd_common.c3
-rw-r--r--stream/stream_dvd_common.h3
-rw-r--r--stream/stream_dvdnav.c2
4 files changed, 6 insertions, 5 deletions
diff --git a/stream/stream_dvd.c b/stream/stream_dvd.c
index d19ce1ce5e..baa535500e 100644
--- a/stream/stream_dvd.c
+++ b/stream/stream_dvd.c
@@ -132,9 +132,6 @@ static void dvd_set_speed(char *device, unsigned speed)
#endif
#endif
-const char * const dvd_audio_stream_types[8] = { "ac3","unknown","mpeg1","mpeg2ext","lpcm","unknown","dts" };
-const char * const dvd_audio_stream_channels[6] = { "mono", "stereo", "unknown", "unknown", "5.1/6.1", "5.1" };
-
static struct stream_priv_s {
int title;
diff --git a/stream/stream_dvd_common.c b/stream/stream_dvd_common.c
index 9302b5670b..f28e2c53e5 100644
--- a/stream/stream_dvd_common.c
+++ b/stream/stream_dvd_common.c
@@ -3,6 +3,9 @@
#include <dvdread/ifo_types.h>
#include "stream_dvd_common.h"
+const char * const dvd_audio_stream_types[8] = { "ac3","unknown","mpeg1","mpeg2ext","lpcm","unknown","dts" };
+const char * const dvd_audio_stream_channels[6] = { "mono", "stereo", "unknown", "unknown", "5.1/6.1", "5.1" };
+
/**
\brief Converts DVD time structure to milliseconds.
\param *dev the DVD time structure to convert
diff --git a/stream/stream_dvd_common.h b/stream/stream_dvd_common.h
index 8eb1aa8d60..c320e27e22 100644
--- a/stream/stream_dvd_common.h
+++ b/stream/stream_dvd_common.h
@@ -6,6 +6,9 @@
#include <dvdread/ifo_types.h>
extern char *dvd_device;
+extern const char * const dvd_audio_stream_channels[6];
+extern const char * const dvd_audio_stream_types[8];
+
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 dbe6bdb6a9..1a93611182 100644
--- a/stream/stream_dvdnav.c
+++ b/stream/stream_dvdnav.c
@@ -47,8 +47,6 @@ typedef struct {
unsigned int state;
} dvdnav_priv_t;
-extern char *dvd_audio_stream_channels[6], *dvd_audio_stream_types[8];
-
static struct stream_priv_s {
int track;
char* device;