Mercurial > mplayer.hg
changeset 29845:a05ba1fa78b6
Share dvd_device extern declaration between dvd and dvdnav.
| author | reimar |
|---|---|
| date | Tue, 10 Nov 2009 23:10:57 +0000 |
| parents | ab281bcfecb9 |
| children | f0e4324b3ecd |
| files | stream/stream_dvd.c stream/stream_dvd_common.h stream/stream_dvdnav.c |
| diffstat | 3 files changed, 1 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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 */
--- 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 */
--- 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];