Commit ac57e78f authored by Sam Hocevar's avatar Sam Hocevar

   * XVideo window now has a black background, thanks to Shane Harper.
   * Fixed a heap corruption in dvd_css.c.
parent 7371e7bd
vlc changelog: ChangeLog for vlc
=================
0.2.70: 0.2.70:
...@@ -96,6 +97,10 @@ vlc changelog: ...@@ -96,6 +97,10 @@ vlc changelog:
interface (courtesy of Eugenio Jarosiewicz & Colin Delacroix) ; interface (courtesy of Eugenio Jarosiewicz & Colin Delacroix) ;
* Cleaning code and a small fix to make quit work on OSX * Cleaning code and a small fix to make quit work on OSX
* Disable x11 plugin if X11 headers are not found. * Disable x11 plugin if X11 headers are not found.
* Misc fixes in the DVD input.
* Fixed CSS authentication under Linux.
* Playlist now refreshes when a file is opened.
* XVideo plugin background is now black instead of white.
0.2.63: 0.2.63:
......
...@@ -52,6 +52,8 @@ information, too. ...@@ -52,6 +52,8 @@ information, too.
The team The team
======== ========
See the AUTHORS file for a list of the vlc authors and contributors.
The following teachers were involved in the VideoLAN project : The following teachers were involved in the VideoLAN project :
Pierre Lecoy, teacher-cum-researcher at ECP, Pierre Lecoy, teacher-cum-researcher at ECP,
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* dvd_css.c: Functions for DVD authentification and unscrambling * dvd_css.c: Functions for DVD authentification and unscrambling
***************************************************************************** *****************************************************************************
* Copyright (C) 1999-2001 VideoLAN * Copyright (C) 1999-2001 VideoLAN
* $Id: dvd_css.c,v 1.21 2001/04/06 09:15:47 sam Exp $ * $Id: dvd_css.c,v 1.22 2001/04/08 16:57:47 sam Exp $
* *
* Author: Stphane Borel <stef@via.ecp.fr> * Author: Stphane Borel <stef@via.ecp.fr>
* *
...@@ -75,6 +75,10 @@ int CSSTest( int i_fd ) ...@@ -75,6 +75,10 @@ int CSSTest( int i_fd )
if( i_ret < 0 ) if( i_ret < 0 )
{ {
/* Since it's the first ioctl we try to issue, we add a notice */
intf_ErrMsg( "css error: ioctl_ReadCopyright failed, "
"make sure DVD ioctls were compiled in" );
return i_ret; return i_ret;
} }
...@@ -125,7 +129,7 @@ int CSSInit( css_t * p_css ) ...@@ -125,7 +129,7 @@ int CSSInit( css_t * p_css )
break; break;
} }
intf_ErrMsg( "css error: AGID N/A, invalidating" ); intf_ErrMsg( "css error: ioctl_LUSendAgid failed, invalidating" );
p_css->i_agid = 0; p_css->i_agid = 0;
ioctl_InvalidateAgid( p_css ); ioctl_InvalidateAgid( p_css );
...@@ -134,7 +138,7 @@ int CSSInit( css_t * p_css ) ...@@ -134,7 +138,7 @@ int CSSInit( css_t * p_css )
/* Unable to authenticate without AGID */ /* Unable to authenticate without AGID */
if( i_ret == -1 ) if( i_ret == -1 )
{ {
intf_ErrMsg( "css error: could not get AGID" ); intf_ErrMsg( "css error: ioctl_LUSendAgid failed, fatal" );
return -1; return -1;
} }
...@@ -152,14 +156,14 @@ int CSSInit( css_t * p_css ) ...@@ -152,14 +156,14 @@ int CSSInit( css_t * p_css )
/* Send challenge to LU */ /* Send challenge to LU */
if( ioctl_HostSendChallenge( p_css, p_buffer ) < 0 ) if( ioctl_HostSendChallenge( p_css, p_buffer ) < 0 )
{ {
intf_ErrMsg( "css error: failed sending challenge to LU" ); intf_ErrMsg( "css error: ioctl_HostSendChallenge failed" );
return -1; return -1;
} }
/* Get key1 from LU */ /* Get key1 from LU */
if( ioctl_LUSendKey1( p_css, p_buffer ) < 0) if( ioctl_LUSendKey1( p_css, p_buffer ) < 0)
{ {
intf_ErrMsg( "css error: failed getting key1 from LU" ); intf_ErrMsg( "css error: ioctl_LUSendKey1 failed" );
return -1; return -1;
} }
...@@ -192,7 +196,7 @@ int CSSInit( css_t * p_css ) ...@@ -192,7 +196,7 @@ int CSSInit( css_t * p_css )
/* Get challenge from LU */ /* Get challenge from LU */
if( ioctl_LUSendChallenge( p_css, p_buffer ) < 0 ) if( ioctl_LUSendChallenge( p_css, p_buffer ) < 0 )
{ {
intf_ErrMsg( "css error: failed getting challenge from LU" ); intf_ErrMsg( "css error: ioctl_LUSendKeyChallenge failed" );
return -1; return -1;
} }
...@@ -214,7 +218,7 @@ int CSSInit( css_t * p_css ) ...@@ -214,7 +218,7 @@ int CSSInit( css_t * p_css )
/* Send key2 to LU */ /* Send key2 to LU */
if( ioctl_HostSendKey2( p_css, p_buffer ) < 0 ) if( ioctl_HostSendKey2( p_css, p_buffer ) < 0 )
{ {
intf_ErrMsg( "css error: failed sending key2 to LU" ); intf_ErrMsg( "css error: ioctl_HostSendKey2 failed" );
return -1; return -1;
} }
...@@ -249,7 +253,7 @@ int CSSInit( css_t * p_css ) ...@@ -249,7 +253,7 @@ int CSSInit( css_t * p_css )
/* Get encrypted disc key */ /* Get encrypted disc key */
if( ioctl_ReadKey( p_css, p_buffer ) < 0 ) if( ioctl_ReadKey( p_css, p_buffer ) < 0 )
{ {
intf_ErrMsg( "css error: could not read Disc Key" ); intf_ErrMsg( "css error: ioctl_ReadKey failed" );
return -1; return -1;
} }
...@@ -282,18 +286,6 @@ int CSSInit( css_t * p_css ) ...@@ -282,18 +286,6 @@ int CSSInit( css_t * p_css )
} }
/*****************************************************************************
* CSSEnd : frees css structure
*****************************************************************************/
void CSSEnd( css_t * p_css )
{
#ifdef HAVE_CSS
free( p_css );
#else /* HAVE_CSS */
;
#endif /* HAVE_CSS */
}
/***************************************************************************** /*****************************************************************************
* CSSGetKey : get title key. * CSSGetKey : get title key.
***************************************************************************** *****************************************************************************
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
* -dvd_udf to find files * -dvd_udf to find files
***************************************************************************** *****************************************************************************
* Copyright (C) 1998-2001 VideoLAN * Copyright (C) 1998-2001 VideoLAN
* $Id: input_dvd.c,v 1.39 2001/04/08 09:04:33 stef Exp $ * $Id: input_dvd.c,v 1.40 2001/04/08 16:57:47 sam Exp $
* *
* Author: Stphane Borel <stef@via.ecp.fr> * Author: Stphane Borel <stef@via.ecp.fr>
* *
...@@ -890,7 +890,6 @@ static void DVDEnd( input_thread_t * p_input ) ...@@ -890,7 +890,6 @@ static void DVDEnd( input_thread_t * p_input )
if( p_dvd->b_encrypted ) if( p_dvd->b_encrypted )
{ {
CSSEnd( p_dvd->p_css );
free( p_dvd->p_css ); free( p_dvd->p_css );
} }
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* input_dvd.h: thread structure of the DVD plugin * input_dvd.h: thread structure of the DVD plugin
***************************************************************************** *****************************************************************************
* Copyright (C) 1999-2001 VideoLAN * Copyright (C) 1999-2001 VideoLAN
* $Id: input_dvd.h,v 1.15 2001/04/02 23:30:41 sam Exp $ * $Id: input_dvd.h,v 1.16 2001/04/08 16:57:47 sam Exp $
* *
* Author: Stéphane Borel <stef@via.ecp.fr> * Author: Stéphane Borel <stef@via.ecp.fr>
* *
...@@ -76,7 +76,6 @@ void IfoEnd ( struct ifo_s * ); ...@@ -76,7 +76,6 @@ void IfoEnd ( struct ifo_s * );
*****************************************************************************/ *****************************************************************************/
int CSSTest ( int ); int CSSTest ( int );
int CSSInit ( struct css_s * ); int CSSInit ( struct css_s * );
void CSSEnd ( struct css_s * );
int CSSGetKey ( struct css_s * ); int CSSGetKey ( struct css_s * );
int CSSDescrambleSector ( u8 * , u8 * ); int CSSDescrambleSector ( u8 * , u8 * );
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* vout_xvideo.c: Xvideo video output display method * vout_xvideo.c: Xvideo video output display method
***************************************************************************** *****************************************************************************
* Copyright (C) 1998, 1999, 2000, 2001 VideoLAN * Copyright (C) 1998, 1999, 2000, 2001 VideoLAN
* $Id: vout_xvideo.c,v 1.3 2001/04/04 16:33:07 sam Exp $ * $Id: vout_xvideo.c,v 1.4 2001/04/08 16:57:47 sam Exp $
* *
* Authors: Shane Harper <shanegh@optusnet.com.au> * Authors: Shane Harper <shanegh@optusnet.com.au>
* Vincent Seguin <seguin@via.ecp.fr> * Vincent Seguin <seguin@via.ecp.fr>
...@@ -610,7 +610,7 @@ static int XVideoCreateWindow( vout_thread_t *p_vout ) ...@@ -610,7 +610,7 @@ static int XVideoCreateWindow( vout_thread_t *p_vout )
/* Prepare window attributes */ /* Prepare window attributes */
xwindow_attributes.backing_store = Always; /* save the hidden part */ xwindow_attributes.backing_store = Always; /* save the hidden part */
xwindow_attributes.background_pixel = WhitePixel( p_vout->p_sys->p_display, xwindow_attributes.background_pixel = BlackPixel( p_vout->p_sys->p_display,
p_vout->p_sys->i_screen ); p_vout->p_sys->i_screen );
xwindow_attributes.event_mask = ExposureMask | StructureNotifyMask; xwindow_attributes.event_mask = ExposureMask | StructureNotifyMask;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment