diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-03-14 15:12:25 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-03-14 15:12:25 +0000 |
| commit | abd0a463dca3cdc98d11c7ff811a9be3099d01cc (patch) | |
| tree | 3dee9564a8e7ba68c21c16844af327727b36ce0a /src/spu_dec | |
| parent | 09e2ba368cb0b68e9b91d4b78709c8efa044c538 (diff) | |
| parent | 841473467fd19e4fa4e255d9e17af526ecee5ac8 (diff) | |
| download | xine-lib-abd0a463dca3cdc98d11c7ff811a9be3099d01cc.tar.gz xine-lib-abd0a463dca3cdc98d11c7ff811a9be3099d01cc.tar.bz2 | |
Merge from 1.1.
--HG--
rename : src/libspudec/xine_spu_decoder.c => src/spu_dec/spu_decoder.c
rename : src/libspudec/spu.c => src/spu_dec/spudec.c
rename : src/libspudec/spu.h => src/spu_dec/spudec.h
Diffstat (limited to 'src/spu_dec')
| -rw-r--r-- | src/spu_dec/spu_decoder.c | 9 | ||||
| -rw-r--r-- | src/spu_dec/spudec.c | 9 | ||||
| -rw-r--r-- | src/spu_dec/spudec.h | 6 |
3 files changed, 19 insertions, 5 deletions
diff --git a/src/spu_dec/spu_decoder.c b/src/spu_dec/spu_decoder.c index 0b39243ae..9244564ff 100644 --- a/src/spu_dec/spu_decoder.c +++ b/src/spu_dec/spu_decoder.c @@ -38,8 +38,13 @@ #include "xine-engine/bswap.h" #include <xine/xineutils.h> #ifdef HAVE_DVDNAV -# include <dvdnav/nav_read.h> -# include <dvdnav/nav_types.h> +# ifdef HAVE_DVDNAV_NAVTYPES_H +# include <dvdnav/nav_types.h> +# include <dvdnav/nav_read.h> +# else +# include <dvdread/nav_types.h> +# include <dvdread/nav_read.h> +# endif #else # include "nav_read.h" # include "nav_types.h" diff --git a/src/spu_dec/spudec.c b/src/spu_dec/spudec.c index 8c5a2049d..fc305b864 100644 --- a/src/spu_dec/spudec.c +++ b/src/spu_dec/spudec.c @@ -56,8 +56,13 @@ #include <xine/buffer.h> #include "xine-engine/bswap.h" #ifdef HAVE_DVDNAV -# include <dvdnav/nav_read.h> -# include <dvdnav/nav_print.h> +# ifdef HAVE_DVDNAV_NAVTYPES_H +# include <dvdnav/nav_read.h> +# include <dvdnav/nav_print.h> +# else +# include <dvdread/nav_read.h> +# include <dvdread/nav_print.h> +# endif #else # include "nav_read.h" # include "nav_print.h" diff --git a/src/spu_dec/spudec.h b/src/spu_dec/spudec.h index 4d99e50ce..225a87f13 100644 --- a/src/spu_dec/spudec.h +++ b/src/spu_dec/spudec.h @@ -33,7 +33,11 @@ #include <xine/video_out.h> #include <xine/video_overlay.h> #ifdef HAVE_DVDNAV -# include <dvdnav/nav_types.h> +# ifdef HAVE_DVDNAV_NAVTYPES_H +# include <dvdnav/nav_types.h> +# else +# include <dvdread/nav_types.h> +# endif #else # include "nav_types.h" #endif |