diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-08-21 13:40:16 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-08-21 13:40:16 +0000 |
commit | c2a12149e2cffa26dc857bb07da3a7777381c248 (patch) | |
tree | 6ef5dcf070c753a7c793af8b309879a1f481c0b8 /libdvdcss/libdvdcss.c | |
parent | e9e576a0a6c0a762b72187912a8ef680cb6a7108 (diff) | |
download | mpv-c2a12149e2cffa26dc857bb07da3a7777381c248.tar.bz2 mpv-c2a12149e2cffa26dc857bb07da3a7777381c248.tar.xz |
Sync libdvdcss with upstream version r212.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27474 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libdvdcss/libdvdcss.c')
-rw-r--r-- | libdvdcss/libdvdcss.c | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/libdvdcss/libdvdcss.c b/libdvdcss/libdvdcss.c index 9d992d635d..f2b70d3b6d 100644 --- a/libdvdcss/libdvdcss.c +++ b/libdvdcss/libdvdcss.c @@ -1,8 +1,8 @@ /* libdvdcss.c: DVD reading library. * - * Authors: Stéphane Borel <stef@via.ecp.fr> + * Authors: Stéphane Borel <stef@via.ecp.fr> * Samuel Hocevar <sam@zoy.org> - * Håkan Hjort <d95hjort@dtek.chalmers.se> + * HÃ¥kan Hjort <d95hjort@dtek.chalmers.se> * * Copyright (C) 1998-2002 VideoLAN * $Id$ @@ -375,6 +375,10 @@ LIBDVDCSS_EXPORT dvdcss_t dvdcss_open ( char *psz_target ) "could not get disc key" ); } } + else + { + memset( dvdcss->css.p_disc_key, 0, KEY_SIZE ); + } /* If the cache is enabled, write the cache directory tag */ if( psz_cache ) @@ -793,3 +797,15 @@ LIBDVDCSS_EXPORT int dvdcss_title ( dvdcss_t dvdcss, int i_block ) return _dvdcss_title( dvdcss, i_block ); } +/** + * \brief Return 1 if the DVD is scrambled, 0 otherwise. + * + * \param dvdcss a \e libdvdcss instance. + * \return 1 if the DVD is scrambled, 0 otherwise. + * + * This function returns whether the DVD is scrambled. + */ +LIBDVDCSS_EXPORT int dvdcss_is_scrambled ( dvdcss_t dvdcss ) +{ + return dvdcss->b_scrambled; +} |