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

libdvdcss: Sync some minor changes from upstream, up to r237 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32349 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2010-09-25 15:53:03 +00:00 committed by Uoti Urpala
parent a9131fefe4
commit c8a97067aa
8 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Copyright
View File

@ -30,7 +30,7 @@ License: GNU General Public License
Name: libdvdcss
Version: Subversion r231
Version: Subversion r237 + local changes
URL: http://developers.videolan.org/libdvdcss/
Directory: libdvdcss
Copyright: 1998-2008 VideoLAN

6
libdvdcss/bsdi_dvd.h
View File

@ -2,8 +2,8 @@
* $Id$
*/
#ifndef DVDCSS_DVD_H
#define DVDCSS_DVD_H
#ifndef DVDCSS_BSDI_DVD_H
#define DVDCSS_BSDI_DVD_H
#include <sys/cdefs.h>
#include <machine/endian.h>
@ -341,4 +341,4 @@ typedef struct
int error;
} tracktype;
#endif /* DVDCSS_DVD_H */
#endif /* DVDCSS_BSDI_DVD_H */

4
libdvdcss/common.h
View File

@ -24,6 +24,9 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*****************************************************************************/
#ifndef DVDCSS_COMMON_H
#define DVDCSS_COMMON_H
/*****************************************************************************
* Basic types definitions
*****************************************************************************/
@ -79,3 +82,4 @@ typedef __int64 off_t;
#endif
#endif /* DVDCSS_COMMON_H */

7
libdvdcss/css.h
View File

@ -26,6 +26,12 @@
* with libdvdcss; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*****************************************************************************/
#ifndef DVDCSS_CSS_H
#define DVDCSS_CSS_H
#include "dvdcss/dvdcss.h"
#define KEY_SIZE 5
typedef uint8_t dvd_key_t[KEY_SIZE];
@ -54,3 +60,4 @@ int _dvdcss_disckey ( dvdcss_t );
int _dvdcss_titlekey ( dvdcss_t, int , dvd_key_t );
int _dvdcss_unscramble ( uint8_t *, uint8_t * );
#endif /* DVDCSS_CSS_H */

3
libdvdcss/csstables.h
View File

@ -29,6 +29,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*****************************************************************************/
#ifndef DVDCSS_CSSTABLES_H
#define DVDCSS_CSSTABLES_H
static uint8_t p_css_tab1[ 256 ] =
{
@ -390,3 +392,4 @@ static uint8_t p_crypt_tab3[ 288 ] =
0xC3, 0x82, 0xC9, 0x15, 0x57, 0x16, 0x5D, 0x81
};
#endif /* DVDCSS_CSSTABLES_H */

6
libdvdcss/device.h
View File

@ -23,6 +23,9 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*****************************************************************************/
#ifndef DVDCSS_DEVICE_H
#define DVDCSS_DEVICE_H
/*****************************************************************************
* iovec structure: vectored data entry
*****************************************************************************/
@ -33,6 +36,8 @@
# include <sys/uio.h> /* struct iovec */
#endif
#include "dvdcss/dvdcss.h"
#if defined( WIN32 ) && !defined( SYS_CYGWIN )
struct iovec
{
@ -56,3 +61,4 @@ int _dvdcss_close ( dvdcss_t );
int _dvdcss_raw_open ( dvdcss_t, char const * );
#endif
#endif /* DVDCSS_DEVICE_H */

5
libdvdcss/ioctl.h
View File

@ -21,6 +21,9 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*****************************************************************************/
#ifndef DVDCSS_IOCTL_H
#define DVDCSS_IOCTL_H
int ioctl_ReadCopyright ( int, int, int * );
int ioctl_ReadDiscKey ( int, int *, uint8_t * );
int ioctl_ReadTitleKey ( int, int *, int, uint8_t * );
@ -427,3 +430,5 @@ struct OS2_ExecSCSICmd
#pragma pack()
#endif
#endif /* DVDCSS_IOCTL_H */

7
libdvdcss/libdvdcss.h
View File

@ -22,6 +22,12 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*****************************************************************************/
#ifndef DVDCSS_LIBDVDCSS_H
#define DVDCSS_LIBDVDCSS_H
#include "dvdcss/dvdcss.h"
#include "css.h"
struct iovec;
/*****************************************************************************
@ -102,3 +108,4 @@ __forceinline void print_debug(dvdcss_t dvdcss, const char *msg,...)
void _print_error ( dvdcss_t, char * );
#endif /* DVDCSS_LIBDVDCSS_H */