RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Sync libdvdread with version 0.9.7. 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24085 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2007-08-17 07:57:13 +00:00
parent e50520a6d1
commit 9c63470472
5 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog
View File

@ -115,7 +115,7 @@ MPlayer (1.0)
* ability to change subtitle size during playback * ability to change subtitle size during playback
* ability to turn loop on/off during playback * ability to turn loop on/off during playback
* Apple Remote support * Apple Remote support
* libdvdread updated to 0.9.6 * libdvdread updated to 0.9.7
rc1: "Codename intentionally left blank" October 22, 2006 rc1: "Codename intentionally left blank" October 22, 2006

2
Copyright
View File

@ -49,7 +49,7 @@ Copyright: 1998-2006 VideoLAN
License: GNU General Public License License: GNU General Public License
Name: libdvdread Name: libdvdread
Version: 0.9.6 + patches Version: 0.9.7 + patches
Homepage: http://www.dtek.chalmers.se/groups/dvd/development.shtml Homepage: http://www.dtek.chalmers.se/groups/dvd/development.shtml
Directory: dvdread Directory: dvdread
Copyright: 1998, 1999 Eric Smith <eric@brouhaha.com> Copyright: 1998, 1999 Eric Smith <eric@brouhaha.com>

23
dvdread/bswap.h
View File

@ -80,6 +80,13 @@
#define B2N_32(x) x = be32toh(x) #define B2N_32(x) x = be32toh(x)
#define B2N_64(x) x = be64toh(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) #elif defined(ARCH_X86)
inline static unsigned short bswap_16(unsigned short x) inline static unsigned short bswap_16(unsigned short x)
{ {
@ -118,13 +125,22 @@ inline static unsigned long long int bswap_64(unsigned long long int x)
} }
#define B2N_64(x) x = bswap_64(x) #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 /* This is a slow but portable implementation, it has multiple evaluation
* problems so beware. * problems so beware.
* Old FreeBSD's and Solaris don't have <byteswap.h> or any other such * Old FreeBSD's and Solaris don't have <byteswap.h> or any other such
* functionality! * functionality!
*/ */
#elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__) || defined(WIN32) || defined(__BEOS__) || defined(__INTERIX) || defined(__CYGWIN__)
#define B2N_16(x) \ #define B2N_16(x) \
x = ((((x) & 0xff00) >> 8) | \ x = ((((x) & 0xff00) >> 8) | \
(((x) & 0x00ff) << 8)) (((x) & 0x00ff) << 8))
@ -143,12 +159,7 @@ inline static unsigned long long int bswap_64(unsigned long long int x)
(((x) & 0x000000000000ff00) << 40) | \ (((x) & 0x000000000000ff00) << 40) | \
(((x) & 0x00000000000000ff) << 56)) (((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 #endif

2
dvdread/dvd_reader.c
View File

@ -679,7 +679,7 @@ void DVDClose( dvd_reader_t *dvd )
fprintf(stderr, "libdvdread: DVDClose(): Memory leak in align functions\n"); fprintf(stderr, "libdvdread: DVDClose(): Memory leak in align functions\n");
} }
} }
dvdinput_free();
free( dvd ); free( dvd );
} }
} }

2
dvdread/dvd_reader.h
View File

@ -34,7 +34,7 @@
/** /**
* The current version. (0.9.4 => 904, 1.2.3 => 10203) * The current version. (0.9.4 => 904, 1.2.3 => 10203)
*/ */
#define DVDREAD_VERSION 906 #define DVDREAD_VERSION 907
/** /**