diff options
| author | rathann <rathann@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-12-28 12:34:20 +0000 |
|---|---|---|
| committer | rathann <rathann@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-12-28 12:34:20 +0000 |
| commit | 8ae9b081919f29fe55140e382f881dba273f6c02 (patch) | |
| tree | 7420d69d7fcbdbfd9d85000da9b82e77bfdcde05 /libmpdemux | |
| parent | b44bf0d4d94eca335afc8872af2968676e013572 (diff) | |
| download | mpv-8ae9b081919f29fe55140e382f881dba273f6c02.tar.bz2 mpv-8ae9b081919f29fe55140e382f881dba273f6c02.tar.xz | |
fix dvdread version macro
patch by Emanuele Giaquinta (emanuele.giaquinta at gmail dot com)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17258 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/stream_dvd.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libmpdemux/stream_dvd.c b/libmpdemux/stream_dvd.c index c5793ffd96..21fa46d8af 100644 --- a/libmpdemux/stream_dvd.c +++ b/libmpdemux/stream_dvd.c @@ -34,17 +34,19 @@ int dvd_angle=1; #ifdef HAVE_DVD #ifdef USE_DVDREAD -#define DVDREAD_VERSION(maj,min,micro) ((maj)*10000 + (min)*100 + (micro)) +#define LIBDVDREAD_VERSION(maj,min,micro) ((maj)*10000 + (min)*100 + (micro)) /* * Try to autodetect the libdvd-0.9.0 library * (0.9.0 removed the <dvdread/dvd_udf.h> header, and moved the two defines * DVD_VIDEO_LB_LEN and MAX_UDF_FILE_NAME_LEN from it to * <dvdread/dvd_reader.h>) */ +#ifndef DVDREAD_VERSION #if defined(DVD_VIDEO_LB_LEN) && defined(MAX_UDF_FILE_NAME_LEN) -#define LIBDVDREAD_VERSION DVDREAD_VERSION(0,9,0) +#define DVDREAD_VERSION LIBDVDREAD_VERSION(0,9,0) #else -#define LIBDVDREAD_VERSION DVDREAD_VERSION(0,8,0) +#define DVDREAD_VERSION LIBDVDREAD_VERSION(0,8,0) +#endif #endif char * dvd_audio_stream_types[8] = { "ac3","unknown","mpeg1","mpeg2ext","lpcm","unknown","dts" }; @@ -263,7 +265,7 @@ read_next: if(data[38]==0 && data[39]==0 && data[40]==1 && data[41]==0xBF && data[1024]==0 && data[1025]==0 && data[1026]==1 && data[1027]==0xBF) { // found a Navi packet!!! -#if LIBDVDREAD_VERSION >= DVDREAD_VERSION(0,9,0) +#if DVDREAD_VERSION >= LIBDVDREAD_VERSION(0,9,0) navRead_DSI(&d->dsi_pack, &(data[ DSI_START_BYTE ])); #else navRead_DSI(&d->dsi_pack, &(data[ DSI_START_BYTE ]), sizeof(dsi_t)); |