# HG changeset patch # User nicodvb # Date 1212238375 0 # Node ID bae68d1afda29f6a3273332653d7fe506d99ffbd # Parent 2d8a08e5330f08f956c8e5c99d8683aa68e705c1 adapted to the dvdread->libdvdread transition in dvdnav's repository diff -r 2d8a08e5330f -r bae68d1afda2 stream/stream_dvd.h --- a/stream/stream_dvd.h Sat May 31 12:51:38 2008 +0000 +++ b/stream/stream_dvd.h Sat May 31 12:52:55 2008 +0000 @@ -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 -r 2d8a08e5330f -r bae68d1afda2 stream/stream_dvd_common.c --- a/stream/stream_dvd_common.c Sat May 31 12:51:38 2008 +0000 +++ b/stream/stream_dvd_common.c Sat May 31 12:52:55 2008 +0000 @@ -1,5 +1,9 @@ #include +#ifdef USE_DVDREAD_INTERNAL #include +#else +#include +#endif #include "stream_dvd_common.h" /** diff -r 2d8a08e5330f -r bae68d1afda2 stream/stream_dvd_common.h --- a/stream/stream_dvd_common.h Sat May 31 12:51:38 2008 +0000 +++ b/stream/stream_dvd_common.h Sat May 31 12:52:55 2008 +0000 @@ -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);