From c2ed18b40b50a0506c23a39752f9963b92ad130f Mon Sep 17 00:00:00 2001 From: nicodvb Date: Sat, 31 May 2008 12:52:55 +0000 Subject: 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 --- stream/stream_dvd.h | 8 ++++---- stream/stream_dvd_common.c | 4 ++++ stream/stream_dvd_common.h | 4 ++++ 3 files changed, 12 insertions(+), 4 deletions(-) (limited to 'stream') 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 -#include -#include -#include +#include +#include +#include +#include #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 +#ifdef USE_DVDREAD_INTERNAL #include +#else +#include +#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 +#ifdef USE_DVDREAD_INTERNAL #include +#else +#include +#endif int mp_dvdtimetomsec(dvd_time_t *dt); -- cgit v1.2.3