From bf05a0e1f058df025aca2630aac47b7994f0e6e6 Mon Sep 17 00:00:00 2001 From: Gildas Bazin Date: Sun, 19 May 2002 12:57:32 +0000 Subject: [PATCH] * 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. --- AUTHORS | 5 +++-- extras/Win32_msvc/defs.h | 3 +++ extras/Win32_msvc/modules_builtin_msvc.h | 15 ++++++++------- extras/Win32_msvc/vlc.dsp | 8 +------- plugins/filter/clone.c | 4 ++-- plugins/filter/deinterlace.c | 4 ++-- plugins/filter/distort.c | 4 ++-- plugins/filter/invert.c | 4 ++-- plugins/filter/transform.c | 4 ++-- plugins/filter/wall.c | 4 ++-- plugins/mpeg_vdec/video_parser.c | 8 +++++--- src/interface/main.c | 21 ++++----------------- 12 files changed, 36 insertions(+), 48 deletions(-) diff --git a/AUTHORS b/AUTHORS index 6f817a71ee..04cfadccc0 100644 --- 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 ffab3290c8..a12f41a685 100755 --- 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 17f18514c4..18da4c3289 100755 --- 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* ); -int ActivateModule__MODULE_dvd( module_t* ); -int DeactivateModule__MODULE_dvd( module_t* ); -int InitModule__MODULE_gtk( module_t* ); -int ActivateModule__MODULE_gtk( module_t* ); -int DeactivateModule__MODULE_gtk( module_t* ); +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); \ + ALLOCATE_BUILTIN(dvd); \ + ALLOCATE_BUILTIN(wall); \ } while( 0 ); diff --git a/extras/Win32_msvc/vlc.dsp b/extras/Win32_msvc/vlc.dsp index 425d6f6e75..02811c0b4a 100755 --- a/extras/Win32_msvc/vlc.dsp +++ b/extras/Win32_msvc/vlc.dsp @@ -66,7 +66,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# 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 +# 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 # ADD BASE RSC /l 0x414 /d "_DEBUG" # ADD RSC /l 0x809 /i "../" /d "_DEBUG" BSC32=bscmake.exe @@ -499,7 +499,6 @@ SOURCE=..\..\plugins\filter\distort.c !ELSEIF "$(CFG)" == "vlc - Win32 Debug" -# PROP Exclude_From_Build 1 # ADD CPP /D "__BUILTIN__" /D MODULE_NAME=distort !ENDIF @@ -513,8 +512,6 @@ SOURCE=..\..\plugins\filter\filter_common.h !ELSEIF "$(CFG)" == "vlc - Win32 Debug" -# PROP Exclude_From_Build 1 - !ENDIF # End Source File @@ -528,7 +525,6 @@ SOURCE=..\..\plugins\filter\invert.c !ELSEIF "$(CFG)" == "vlc - Win32 Debug" -# PROP Exclude_From_Build 1 # ADD CPP /D "__BUILTIN__" /D MODULE_NAME=insert !ENDIF @@ -544,7 +540,6 @@ SOURCE=..\..\plugins\filter\transform.c !ELSEIF "$(CFG)" == "vlc - Win32 Debug" -# PROP Exclude_From_Build 1 # ADD CPP /D "__BUILTIN__" /D MODULE_NAME=transform !ENDIF @@ -560,7 +555,6 @@ SOURCE=..\..\plugins\filter\wall.c !ELSEIF "$(CFG)" == "vlc - Win32 Debug" -# PROP Exclude_From_Build 1 # ADD CPP /D "__BUILTIN__" /D MODULE_NAME=wall !ENDIF diff --git a/plugins/filter/clone.c b/plugins/filter/clone.c index f12cd0003f..2a85275a35 100644 --- 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 * @@ -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 0b430e5a5a..7174cd7eed 100644 --- 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 * @@ -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 80bfefff95..b25bc8eca5 100644 --- 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 * @@ -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 473a369cd4..341add646a 100644 --- 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 * @@ -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 f3367b9455..d98d5a9603 100644 --- 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 * @@ -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 211f8abebc..2599dcdb32 100644 --- 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 * @@ -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 1677cd10ba..ac307c25ad 100644 --- 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 * Samuel Hocevar @@ -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 6ad2c5a8c0..14fff56951 100644 --- 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 * Samuel Hocevar @@ -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 " \ -- 2.39.5