* XVideo window now has a black background, thanks to Shane Harper.

   * Fixed a heap corruption in dvd_css.c.

diff --git a/ChangeLog b/ChangeLog
index 9feff0e0ce9133343b01b91c2e72978eb1e51ac4..5e8a494877b27561180197380fa84a7847399c20 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
-vlc changelog:
+ChangeLog for vlc
+=================
 
 0.2.70:
 
@@ -96,6 +97,10 @@ vlc changelog:
     interface (courtesy of Eugenio Jarosiewicz & Colin Delacroix) ;
   * Cleaning code and a small fix to make quit work on OSX
   * 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:
 

diff --git a/README b/README
index f4aef212f1fca0a11ce6d5e0c97a38891802213e..5139aae84d093057055ae6776cf3f64f90d2cb0a 100644 (file)
--- a/README
+++ b/README
@@ -52,6 +52,8 @@ information, too.
 The team
 ========
 
+See the AUTHORS file for a list of the vlc authors and contributors.
+
 The following teachers were involved in the VideoLAN project :
 
   Pierre Lecoy, teacher-cum-researcher at ECP,

diff --git a/plugins/dvd/dvd_css.c b/plugins/dvd/dvd_css.c
index 90164aa3b9acbaff959decf6b147c306952c8a97..d999a8b5760b9c937ec63e82c94a5adb6823ddee 100644 (file)
--- a/plugins/dvd/dvd_css.c
+++ b/plugins/dvd/dvd_css.c
@@ -2,7 +2,7 @@
  * dvd_css.c: Functions for DVD authentification and unscrambling
  *****************************************************************************
  * 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: Stéphane Borel <stef@via.ecp.fr>
  *
@@ -75,6 +75,10 @@ int CSSTest( int i_fd )
 
     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;
     }
 
@@ -125,7 +129,7 @@ int CSSInit( css_t * p_css )
             break;
         }
 
-        intf_ErrMsg( "css error: AGID N/A, invalidating" );
+        intf_ErrMsg( "css error: ioctl_LUSendAgid failed, invalidating" );
 
         p_css->i_agid = 0;
         ioctl_InvalidateAgid( p_css );
@@ -134,7 +138,7 @@ int CSSInit( css_t * p_css )
     /* Unable to authenticate without AGID */
     if( i_ret == -1 )
     {
-        intf_ErrMsg( "css error: could not get AGID" );
+        intf_ErrMsg( "css error: ioctl_LUSendAgid failed, fatal" );
         return -1;
     }
 
@@ -152,14 +156,14 @@ int CSSInit( css_t * p_css )
     /* Send challenge to LU */
     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;
     }
 
     /* Get key1 from LU */
     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;
     }
 
@@ -192,7 +196,7 @@ int CSSInit( css_t * p_css )
     /* Get challenge from LU */
     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;
     }
 
@@ -214,7 +218,7 @@ int CSSInit( css_t * p_css )
     /* Send key2 to LU */
     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;
     }
 
@@ -249,7 +253,7 @@ int CSSInit( css_t * p_css )
     /* Get encrypted disc key */
     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;
     }
 
@@ -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.
  *****************************************************************************

diff --git a/plugins/dvd/input_dvd.c b/plugins/dvd/input_dvd.c
index 8752f7b39d11e7fd6d3b04417096505105cf7adc..b2ba9aa5b8fad3f615f0e2f60910c317f5ac6c52 100644 (file)
--- a/plugins/dvd/input_dvd.c
+++ b/plugins/dvd/input_dvd.c
@@ -10,7 +10,7 @@
  *  -dvd_udf to find files
  *****************************************************************************
  * 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: Stéphane Borel <stef@via.ecp.fr>
  *
@@ -890,7 +890,6 @@ static void DVDEnd( input_thread_t * p_input )
 
     if( p_dvd->b_encrypted )
     {
-        CSSEnd( p_dvd->p_css );
         free( p_dvd->p_css );
     }
 

diff --git a/plugins/dvd/input_dvd.h b/plugins/dvd/input_dvd.h
index 92d2c3df5bedc14ca63da43770c7b8b47bb074c1..89545ce01665297b4d3d008812aba232bfd8b67e 100644 (file)
--- a/plugins/dvd/input_dvd.h
+++ b/plugins/dvd/input_dvd.h
@@ -2,7 +2,7 @@
  * input_dvd.h: thread structure of the DVD plugin
  *****************************************************************************
  * 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>
  *
@@ -76,7 +76,6 @@ void  IfoEnd      ( struct ifo_s * );
  *****************************************************************************/
 int   CSSTest             ( int );
 int   CSSInit             ( struct css_s * );
-void  CSSEnd              ( struct css_s * );
 int   CSSGetKey           ( struct css_s * );
 int   CSSDescrambleSector ( u8 * , u8 * );
 

diff --git a/plugins/x11/vout_xvideo.c b/plugins/x11/vout_xvideo.c
index 4f07e5276950d1962034d0e46286563f42d7f3ff..197a9216ce76c7b8e47a7d9d44ffcdda8ca00724 100644 (file)
--- a/plugins/x11/vout_xvideo.c
+++ b/plugins/x11/vout_xvideo.c
@@ -2,7 +2,7 @@
  * vout_xvideo.c: Xvideo video output display method
  *****************************************************************************
  * 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>
  *          Vincent Seguin <seguin@via.ecp.fr>
@@ -610,7 +610,7 @@ static int XVideoCreateWindow( vout_thread_t *p_vout )
 
     /* Prepare window attributes */
     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 );
 
     xwindow_attributes.event_mask = ExposureMask | StructureNotifyMask;