Miscellaneous typos.

diff --git a/include/config.h.in b/include/config.h.in
index 637496904bd50e6cde4adf77ad1afbbdb38a583f..607ba57b02379fb671c00a1f9a04f15b6b00419e 100644 (file)
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -167,7 +167,7 @@
 #define INPUT_MAX_SOURCE_LENGTH         100
 
 /* Maximum memory the input is allowed to use (20 MB) */
-#define INPUT_MAX_ALLOCATION                   20971520
+#define INPUT_MAX_ALLOCATION            20971520
 
 /* Default network protocol */
 #define INPUT_NETWORK_PROTOCOL_VAR      "vlc_network_protocol"

diff --git a/plugins/dvd/input_dvd.c b/plugins/dvd/input_dvd.c
index e08972a31b2d0b5f6d428e3c0d76662f26c1cd31..6466d22f1bbdb2fb49e94613d1ea5b0eea4de130 100644 (file)
--- a/plugins/dvd/input_dvd.c
+++ b/plugins/dvd/input_dvd.c
@@ -9,7 +9,7 @@
  *  -dvd_udf to find files
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: input_dvd.c,v 1.116 2001/12/30 07:09:55 sam Exp $
+ * $Id: input_dvd.c,v 1.117 2001/12/31 01:13:12 massiot Exp $
  *
  * Author: Stéphane Borel <stef@via.ecp.fr>
  *
@@ -810,7 +810,7 @@ static int DVDSetArea( input_thread_t * p_input, input_area_t * p_area )
 
 
 /*****************************************************************************
- * DVDRead: reads data packets into the netlist.
+ * DVDRead: reads data packets.
  *****************************************************************************
  * Returns -1 in case of error, 0 in case of EOF, otherwise the number of
  * packets.

diff --git a/plugins/dvdread/input_dvdread.c b/plugins/dvdread/input_dvdread.c
index 6a76607789d6237a5965b5f8d2d02e76c9a09f90..68f5915c61dffde39bff895fc9fc8bfb03f12fe8 100644 (file)
--- a/plugins/dvdread/input_dvdread.c
+++ b/plugins/dvdread/input_dvdread.c
@@ -6,7 +6,7 @@
  * It depends on: libdvdread for ifo files and block reading.
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: input_dvdread.c,v 1.13 2001/12/30 22:10:26 stef Exp $
+ * $Id: input_dvdread.c,v 1.14 2001/12/31 01:13:12 massiot Exp $
  *
  * Author: Stéphane Borel <stef@via.ecp.fr>
  *
@@ -73,7 +73,6 @@
 
 /* how many blocks DVDRead will read in each loop */
 #define DVD_BLOCK_READ_ONCE 64
-#define DVD_DATA_READ_ONCE  (4 * DVD_BLOCK_READ_ONCE)
 
 /*****************************************************************************
  * Local prototypes
@@ -194,8 +193,7 @@ static void DvdReadInit( input_thread_t * p_input )
         return;
     }
 
-    /* We read DVD_BLOCK_READ_ONCE in each loop, so the input will receive
-     * DVD_DATA_READ_ONCE at most */
+    /* We read DVD_BLOCK_READ_ONCE in each loop */
     p_dvd->i_block_once = DVD_BLOCK_READ_ONCE;
 
     /* Ifo allocation & initialisation */
@@ -781,7 +779,7 @@ static int DvdReadRead( input_thread_t * p_input,
 {
     thread_dvd_data_t *     p_dvd;
     u8                      p_data[DVD_VIDEO_LB_LEN];
-    struct iovec            p_vec[DVD_DATA_READ_ONCE];
+    struct iovec            p_vec[DVD_DATA_BLOCK_ONCE];
     u8 *                    pi_cur;
     int                     i_blocks;
     int                     i_read;
@@ -856,7 +854,7 @@ static int DvdReadRead( input_thread_t * p_input,
 
     /* Get iovecs */
     *pp_data = p_data_p = input_BuffersToIO( p_input->p_method_data, p_vec,
-                                             DVD_DATA_READ_ONCE );
+                                             DVD_BLOCK_READ_ONCE );
 
     if ( p_data_p == NULL )
     {