Mercurial > mplayer.hg
changeset 26906:bae68d1afda2
adapted to the dvdread->libdvdread transition in dvdnav's repository
| author | nicodvb |
|---|---|
| date | Sat, 31 May 2008 12:52:55 +0000 |
| parents | 2d8a08e5330f |
| children | f0d0b666ee35 |
| files | stream/stream_dvd.h stream/stream_dvd_common.c stream/stream_dvd_common.h |
| diffstat | 3 files changed, 12 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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 <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"
--- 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 <inttypes.h> +#ifdef USE_DVDREAD_INTERNAL #include <dvdread/ifo_types.h> +#else +#include <libdvdread/ifo_types.h> +#endif #include "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 <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);