diff options
| author | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-05-31 12:52:55 +0000 |
|---|---|---|
| committer | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-05-31 12:52:55 +0000 |
| commit | c2ed18b40b50a0506c23a39752f9963b92ad130f (patch) | |
| tree | 032db43adb84a9da5573cb6d7c9c62819c319c93 /stream | |
| parent | 71628d29e197458a7bacf5c622645cedcaabfc29 (diff) | |
| download | mpv-c2ed18b40b50a0506c23a39752f9963b92ad130f.tar.bz2 mpv-c2ed18b40b50a0506c23a39752f9963b92ad130f.tar.xz | |
adapted to the dvdread->libdvdread transition in dvdnav's repository
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26938 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream')
| -rw-r--r-- | stream/stream_dvd.h | 8 | ||||
| -rw-r--r-- | stream/stream_dvd_common.c | 4 | ||||
| -rw-r--r-- | stream/stream_dvd_common.h | 4 |
3 files changed, 12 insertions, 4 deletions
diff --git a/stream/stream_dvd.h b/stream/stream_dvd.h index 84ab1baaa1..379a7ffc84 100644 --- a/stream/stream_dvd.h +++ b/stream/stream_dvd.h @@ -8,10 +8,10 @@ #include "dvdread/ifo_read.h" #include "dvdread/nav_read.h" #else -#include <dvdread/dvd_reader.h> -#include <dvdread/ifo_types.h> -#include <dvdread/ifo_read.h> -#include <dvdread/nav_read.h> +#include <libdvdread/dvd_reader.h> +#include <libdvdread/ifo_types.h> +#include <libdvdread/ifo_read.h> +#include <libdvdread/nav_read.h> #endif #include "stream.h" diff --git a/stream/stream_dvd_common.c b/stream/stream_dvd_common.c index 895db3a567..60abed55e3 100644 --- a/stream/stream_dvd_common.c +++ b/stream/stream_dvd_common.c @@ -1,5 +1,9 @@ #include <inttypes.h> +#ifdef USE_DVDREAD_INTERNAL #include <dvdread/ifo_types.h> +#else +#include <libdvdread/ifo_types.h> +#endif #include "stream_dvd_common.h" /** diff --git a/stream/stream_dvd_common.h b/stream/stream_dvd_common.h index 9838f612fc..443daa45f9 100644 --- a/stream/stream_dvd_common.h +++ b/stream/stream_dvd_common.h @@ -2,7 +2,11 @@ #define MPLAYER_STREAM_DVD_COMMON_H #include <inttypes.h> +#ifdef USE_DVDREAD_INTERNAL #include <dvdread/ifo_types.h> +#else +#include <libdvdread/ifo_types.h> +#endif int mp_dvdtimetomsec(dvd_time_t *dt); |