* filters were using memalign but freeing p_data instead of p_data_orig.

* updated MSVC++ project.
* small corrections to the LONGTEXT descriptions in main.c.

diff --git a/AUTHORS b/AUTHORS
index 6f817a71eefb566defe84bdb3d27b769fc55d95f..04cfadccc0993f9c9d286f2f8c9d8a86a45983a0 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -45,9 +45,10 @@ N: Gildas Bazin
 E: gbazin@netcourrier.com
 C: gbazin
 D: mingw32 port, various win32 fixes
-D: DirectX audio and video output
+D: DirectX audio and video output, win32 WaveOut audio output
+D: a52 decoder using liba52
 D: Configuration file infrastructure
-S: Spain
+S: France
 
 N: Johan Bilien
 E: jobi@via.ecp.fr

diff --git a/extras/Win32_msvc/defs.h b/extras/Win32_msvc/defs.h
index ffab3290c827b471383bd099d6a51461c9bf07be..a12f41a6859f0a3defc9968b37374c91bcd4e1b5 100755 (executable)
--- a/extras/Win32_msvc/defs.h
+++ b/extras/Win32_msvc/defs.h
@@ -91,6 +91,9 @@
 /* Maximum supported data alignment */
 #define ATTRIBUTE_ALIGNED_MAX 16
 
+/* iline */
+#define inline __inline
+
 /* Simple version string */
 #define VERSION_MESSAGE "vlc 0.3.1_2002-05-17 Ourumov Copyright 1996-2002 VideoLAN"
 

diff --git a/extras/Win32_msvc/modules_builtin_msvc.h b/extras/Win32_msvc/modules_builtin_msvc.h
index 17f18514c4a4744b71294204392c501c236e5e05..18da4c328934dfea0dde7c386348d7610ae11bd0 100755 (executable)
--- a/extras/Win32_msvc/modules_builtin_msvc.h
+++ b/extras/Win32_msvc/modules_builtin_msvc.h
@@ -103,12 +103,12 @@ int DeactivateModule__MODULE_dummy( module_t* );
 int InitModule__MODULE_mpeg_vdec( module_t* );
 int ActivateModule__MODULE_mpeg_vdec( module_t* );
 int DeactivateModule__MODULE_mpeg_vdec( module_t* );
-int InitModule__MODULE_dvd( module_t* );\r
-int ActivateModule__MODULE_dvd( module_t* );\r
-int DeactivateModule__MODULE_dvd( module_t* );\r
-int InitModule__MODULE_gtk( module_t* );\r
-int ActivateModule__MODULE_gtk( module_t* );\r
-int DeactivateModule__MODULE_gtk( module_t* );\r
+int InitModule__MODULE_dvd( module_t* );
+int ActivateModule__MODULE_dvd( module_t* );
+int DeactivateModule__MODULE_dvd( module_t* );
+int InitModule__MODULE_wall( module_t* );
+int ActivateModule__MODULE_wall( module_t* );
+int DeactivateModule__MODULE_wall( module_t* );
 
 #define ALLOCATE_ALL_BUILTINS() \
     do \
@@ -135,5 +135,6 @@ int DeactivateModule__MODULE_gtk( module_t* );
         ALLOCATE_BUILTIN(ac3_adec); \
         ALLOCATE_BUILTIN(dummy); \
         ALLOCATE_BUILTIN(mpeg_vdec); \
-        ALLOCATE_BUILTIN(dvd); \\r
+        ALLOCATE_BUILTIN(dvd); \
+        ALLOCATE_BUILTIN(wall); \
     } while( 0 );

diff --git a/extras/Win32_msvc/vlc.dsp b/extras/Win32_msvc/vlc.dsp
index 425d6f6e75494d45bb2ffd7847082c0758426f82..02811c0b4a3014295029ae54f6d8836f6fa549ed 100755 (executable)
--- a/extras/Win32_msvc/vlc.dsp
+++ b/extras/Win32_msvc/vlc.dsp
@@ -66,7 +66,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "__VLC__" /YX /FD /GZ /I../../include /c\r
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "__VLC__" /FR /YX /FD /GZ /I../../include /c\r
 # ADD BASE RSC /l 0x414 /d "_DEBUG"\r
 # ADD RSC /l 0x809 /i "../" /d "_DEBUG"\r
 BSC32=bscmake.exe\r
@@ -499,7 +499,6 @@ SOURCE=..\..\plugins\filter\distort.c
 \r
 !ELSEIF  "$(CFG)" == "vlc - Win32 Debug"\r
 \r
-# PROP Exclude_From_Build 1\r
 # ADD CPP /D "__BUILTIN__" /D MODULE_NAME=distort\r
 \r
 !ENDIF \r
@@ -513,8 +512,6 @@ SOURCE=..\..\plugins\filter\filter_common.h
 \r
 !ELSEIF  "$(CFG)" == "vlc - Win32 Debug"\r
 \r
-# PROP Exclude_From_Build 1\r
-\r
 !ENDIF \r
 \r
 # End Source File\r
@@ -528,7 +525,6 @@ SOURCE=..\..\plugins\filter\invert.c
 \r
 !ELSEIF  "$(CFG)" == "vlc - Win32 Debug"\r
 \r
-# PROP Exclude_From_Build 1\r
 # ADD CPP /D "__BUILTIN__" /D MODULE_NAME=insert\r
 \r
 !ENDIF \r
@@ -544,7 +540,6 @@ SOURCE=..\..\plugins\filter\transform.c
 \r
 !ELSEIF  "$(CFG)" == "vlc - Win32 Debug"\r
 \r
-# PROP Exclude_From_Build 1\r
 # ADD CPP /D "__BUILTIN__" /D MODULE_NAME=transform\r
 \r
 !ENDIF \r
@@ -560,7 +555,6 @@ SOURCE=..\..\plugins\filter\wall.c
 \r
 !ELSEIF  "$(CFG)" == "vlc - Win32 Debug"\r
 \r
-# PROP Exclude_From_Build 1\r
 # ADD CPP /D "__BUILTIN__" /D MODULE_NAME=wall\r
 \r
 !ENDIF \r

diff --git a/plugins/filter/clone.c b/plugins/filter/clone.c
index f12cd0003f0835afe0987341934d29bff67bd8f4..2a85275a35aa1439e61d58bdee1268f068377693 100644 (file)
--- a/plugins/filter/clone.c
+++ b/plugins/filter/clone.c
@@ -2,7 +2,7 @@
  * clone.c : Clone video plugin for vlc
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: clone.c,v 1.1 2002/05/13 19:30:40 sam Exp $
+ * $Id: clone.c,v 1.2 2002/05/19 12:57:32 gbazin Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -222,7 +222,7 @@ static void vout_End( vout_thread_t *p_vout )
     for( i_index = I_OUTPUTPICTURES ; i_index ; )
     {
         i_index--;
-        free( PP_OUTPUTPICTURE[ i_index ]->p_data );
+        free( PP_OUTPUTPICTURE[ i_index ]->p_data_orig );
     }
 }
 

diff --git a/plugins/filter/deinterlace.c b/plugins/filter/deinterlace.c
index 0b430e5a5a7dd15619e391d2ac18f15393ca7019..7174cd7eed36a17eff7617a59dbfcb7afe6e0bf9 100644 (file)
--- a/plugins/filter/deinterlace.c
+++ b/plugins/filter/deinterlace.c
@@ -2,7 +2,7 @@
  * deinterlace.c : deinterlacer plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: deinterlace.c,v 1.9 2002/04/19 13:56:11 sam Exp $
+ * $Id: deinterlace.c,v 1.10 2002/05/19 12:57:32 gbazin Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -256,7 +256,7 @@ static void vout_End( vout_thread_t *p_vout )
     for( i_index = I_OUTPUTPICTURES ; i_index ; )
     {
         i_index--;
-        free( PP_OUTPUTPICTURE[ i_index ]->p_data );
+        free( PP_OUTPUTPICTURE[ i_index ]->p_data_orig );
     }
 }
 

diff --git a/plugins/filter/distort.c b/plugins/filter/distort.c
index 80bfefff9534cdcb32fb7cd5aee6da066df7e009..b25bc8eca5a4e452f28ad01b5a526d936a4bf85f 100644 (file)
--- a/plugins/filter/distort.c
+++ b/plugins/filter/distort.c
@@ -2,7 +2,7 @@
  * distort.c : Misc video effects plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: distort.c,v 1.10 2002/04/19 13:56:11 sam Exp $
+ * $Id: distort.c,v 1.11 2002/05/19 12:57:32 gbazin Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -223,7 +223,7 @@ static void vout_End( vout_thread_t *p_vout )
     for( i_index = I_OUTPUTPICTURES ; i_index ; )
     {
         i_index--;
-        free( PP_OUTPUTPICTURE[ i_index ]->p_data );
+        free( PP_OUTPUTPICTURE[ i_index ]->p_data_orig );
     }
 }
 

diff --git a/plugins/filter/invert.c b/plugins/filter/invert.c
index 473a369cd4c301b0993d005ef402560863daa791..341add646acd1e22ba3a85ddf50208730ce744f8 100644 (file)
--- a/plugins/filter/invert.c
+++ b/plugins/filter/invert.c
@@ -2,7 +2,7 @@
  * invert.c : Invert video plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: invert.c,v 1.10 2002/04/19 13:56:11 sam Exp $
+ * $Id: invert.c,v 1.11 2002/05/19 12:57:32 gbazin Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -172,7 +172,7 @@ static void vout_End( vout_thread_t *p_vout )
     for( i_index = I_OUTPUTPICTURES ; i_index ; )
     {
         i_index--;
-        free( PP_OUTPUTPICTURE[ i_index ]->p_data );
+        free( PP_OUTPUTPICTURE[ i_index ]->p_data_orig );
     }
 }
 

diff --git a/plugins/filter/transform.c b/plugins/filter/transform.c
index f3367b9455beb02a1a8cc28e3c7ae717fe0e17f8..d98d5a96038bd51f4a6dbbd0fb62929cbf47522a 100644 (file)
--- a/plugins/filter/transform.c
+++ b/plugins/filter/transform.c
@@ -2,7 +2,7 @@
  * transform.c : transform image plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: transform.c,v 1.9 2002/04/19 13:56:11 sam Exp $
+ * $Id: transform.c,v 1.10 2002/05/19 12:57:32 gbazin Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -242,7 +242,7 @@ static void vout_End( vout_thread_t *p_vout )
     for( i_index = I_OUTPUTPICTURES ; i_index ; )
     {
         i_index--;
-        free( PP_OUTPUTPICTURE[ i_index ]->p_data );
+        free( PP_OUTPUTPICTURE[ i_index ]->p_data_orig );
     }
 }
 

diff --git a/plugins/filter/wall.c b/plugins/filter/wall.c
index 211f8abebcf67065aa7ed2863d14c997c727a2f0..2599dcdb32bc4ae7926f999688c1932a2fb9d23a 100644 (file)
--- a/plugins/filter/wall.c
+++ b/plugins/filter/wall.c
@@ -2,7 +2,7 @@
  * wall.c : Wall video plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: wall.c,v 1.16 2002/04/19 13:56:11 sam Exp $
+ * $Id: wall.c,v 1.17 2002/05/19 12:57:32 gbazin Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -367,7 +367,7 @@ static void vout_End( vout_thread_t *p_vout )
     for( i_index = I_OUTPUTPICTURES ; i_index ; )
     {
         i_index--;
-        free( PP_OUTPUTPICTURE[ i_index ]->p_data );
+        free( PP_OUTPUTPICTURE[ i_index ]->p_data_orig );
     }
 }
 

diff --git a/plugins/mpeg_vdec/video_parser.c b/plugins/mpeg_vdec/video_parser.c
index 1677cd10ba99df0c6198b6a5fffbd8e371bf8717..ac307c25adf48a457c9cb7b1da996b8d0e24d3dc 100644 (file)
--- a/plugins/mpeg_vdec/video_parser.c
+++ b/plugins/mpeg_vdec/video_parser.c
@@ -2,7 +2,7 @@
  * video_parser.c : video parser thread
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: video_parser.c,v 1.19 2002/05/19 09:37:02 gbazin Exp $
+ * $Id: video_parser.c,v 1.20 2002/05/19 12:57:32 gbazin Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Samuel Hocevar <sam@via.ecp.fr>
@@ -92,8 +92,10 @@ void _M( vdec_getfunctions )( function_list_t * p_function_list )
 
 #define VPAR_SYNCHRO_TEXT N_("force synchro algorithm {I|I+|IP|IP+|IPB}")
 #define VPAR_SYNCHRO_LONGTEXT N_( \
-    "If you don't want this video decoder to decode all frames of the video, "\
-    "you can specify which synchro algorithm you want to use.")
+    "This allows you to force the synchro algorithm, by directly selecting " \
+    "the types of picture you want to decode. Please bear in mind that if " \
+    "you select more pictures than what your CPU is capable to decode, " \
+    "you won't get anything.")
 
 MODULE_CONFIG_START
 ADD_CATEGORY_HINT( N_("Miscellaneous"), NULL)

diff --git a/src/interface/main.c b/src/interface/main.c
index 6ad2c5a8c0419395ca2c196e479a72b1d2d2335b..14fff56951516f3cf63c133074eec98b70457a17 100644 (file)
--- a/src/interface/main.c
+++ b/src/interface/main.c
@@ -4,7 +4,7 @@
  * and spawn threads.
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: main.c,v 1.192 2002/05/19 11:02:46 massiot Exp $
+ * $Id: main.c,v 1.193 2002/05/19 12:57:32 gbazin Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -95,7 +95,7 @@
 #define INTF_TEXT N_("interface module")
 #define INTF_LONGTEXT N_( \
     "This option allows you to select the interface used by vlc.\nNote that " \
-    "the default behavior is to automatically select the best method " \
+    "the default behavior is to automatically select the best module " \
     "available.")
 
 #define WARNING_TEXT N_("warning level (or use -v, -vv, etc...)")
@@ -254,13 +254,11 @@
 
 #define DVD_DEV_TEXT N_("DVD device")
 #define DVD_DEV_LONGTEXT N_( \
-    "This is the default DVD device to use. Under UNIX it is /dev/dvd, under " \
-    "Windows it is D:.")
+    "This is the default DVD device to use.")
 
 #define VCD_DEV_TEXT N_("VCD device")
 #define VCD_DEV_LONGTEXT N_( \
-    "This is the default VCD device to use. Under UNIX it is /dev/dvd, under " \
-    "Windows it is D:.")
+    "This is the default VCD device to use.")
 
 #define IPV6_TEXT N_("force IPv6")
 #define IPV6_LONGTEXT N_( \
@@ -282,17 +280,6 @@
     "This allows you to select the AC3/A52 audio decoder you want to use. " \
     "Common choices are builtin and a52.")
 
-#define VDEC_SMP_TEXT N_("use additional processors")
-#define VDEC_SMP_LONGTEXT N_( \
-    "This option is deprecated.")
-
-#define VPAR_SYNCHRO_TEXT N_("force synchro algorithm {I|I+|IP|IP+|IPB}")
-#define VPAR_SYNCHRO_LONGTEXT N_( \
-    "This allows you to force the synchro algorithm, by directly selecting " \
-    "the types of picture you want to decode. Please bear in mind that if " \
-    "you select more pictures than what your CPU is capable to decode, " \
-    "you won't get anything.")
-
 #define NOMMX_TEXT N_("disable CPU's MMX support")
 #define NOMMX_LONGTEXT N_( \
     "If your processor supports the MMX instructions set but you don't want " \