Mercurial > mplayer.hg
diff libdvdcss/libdvdcss.c @ 27442:afa2cc0166be
Sync libdvdcss with upstream version r212.
| author | diego |
|---|---|
| date | Thu, 21 Aug 2008 13:40:16 +0000 |
| parents | f0788169e503 |
| children | 60bd1a7f3fc6 |
line wrap: on
line diff
--- a/libdvdcss/libdvdcss.c Thu Aug 21 11:00:47 2008 +0000 +++ b/libdvdcss/libdvdcss.c Thu Aug 21 13:40:16 2008 +0000 @@ -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 @@ "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 @@ 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; +}