Mercurial > mplayer.hg
changeset 24065:b69c47dca975
Sync libdvdread with version 0.9.7.
| author | diego |
|---|---|
| date | Fri, 17 Aug 2007 07:57:13 +0000 |
| parents | 7977493e93e5 |
| children | aeb5561cf68b |
| files | Changelog Copyright dvdread/bswap.h dvdread/dvd_reader.c dvdread/dvd_reader.h |
| diffstat | 5 files changed, 21 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/Changelog Thu Aug 16 21:55:17 2007 +0000 +++ b/Changelog Fri Aug 17 07:57:13 2007 +0000 @@ -115,7 +115,7 @@ * ability to change subtitle size during playback * ability to turn loop on/off during playback * Apple Remote support - * libdvdread updated to 0.9.6 + * libdvdread updated to 0.9.7 rc1: "Codename intentionally left blank" October 22, 2006
--- a/Copyright Thu Aug 16 21:55:17 2007 +0000 +++ b/Copyright Fri Aug 17 07:57:13 2007 +0000 @@ -49,7 +49,7 @@ License: GNU General Public License Name: libdvdread -Version: 0.9.6 + patches +Version: 0.9.7 + patches Homepage: http://www.dtek.chalmers.se/groups/dvd/development.shtml Directory: dvdread Copyright: 1998, 1999 Eric Smith <eric@brouhaha.com>
--- a/dvdread/bswap.h Thu Aug 16 21:55:17 2007 +0000 +++ b/dvdread/bswap.h Fri Aug 17 07:57:13 2007 +0000 @@ -80,6 +80,13 @@ #define B2N_32(x) x = be32toh(x) #define B2N_64(x) x = be64toh(x) + +#elif defined(__APPLE__) || defined(__DARWIN__) +#include <libkern/OSByteOrder.h> +#define B2N_16(x) x = OSSwapBigToHostConstInt16(x) +#define B2N_32(x) x = OSSwapBigToHostConstInt32(x) +#define B2N_64(x) x = OSSwapBigToHostConstInt64(x) + #elif defined(ARCH_X86) inline static unsigned short bswap_16(unsigned short x) { @@ -118,13 +125,22 @@ } #define B2N_64(x) x = bswap_64(x) +#else +#if defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__) || defined(WIN32) || defined(__BEOS__) || defined(__INTERIX) || defined(__CYGWIN__) +/* These systems don't have swap macros */ +#else +/* If there isn't a header provided with your system with this functionality + * add the relevant || define( ) to the list above. + */ +#warning "You should add endian swap macros for your system" +#endif + /* This is a slow but portable implementation, it has multiple evaluation * problems so beware. * Old FreeBSD's and Solaris don't have <byteswap.h> or any other such * functionality! */ -#elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__) || defined(WIN32) || defined(__BEOS__) || defined(__INTERIX) || defined(__CYGWIN__) #define B2N_16(x) \ x = ((((x) & 0xff00) >> 8) | \ (((x) & 0x00ff) << 8)) @@ -143,12 +159,7 @@ (((x) & 0x000000000000ff00) << 40) | \ (((x) & 0x00000000000000ff) << 56)) -#else -/* If there isn't a header provided with your system with this functionality - * add the relevant || define( ) to the portable implementation above. - */ -#error "You need to add endian swap macros for you're system" #endif