Skip to content

V
vlc-gpu
Commit bf05a0e1 authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options 

* 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.
parent c7b4f0cf
Show whitespace changes
Inline Side-by-side
Showing with 36 additions and 48 deletions
AUTHORS
View file @ bf05a0e1
...@@ -45,9 +45,10 @@ N: Gildas Bazin ...@@ -45,9 +45,10 @@ N: Gildas Bazin
E: gbazin@netcourrier.com E: gbazin@netcourrier.com
C: gbazin C: gbazin
D: mingw32 port, various win32 fixes 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 D: Configuration file infrastructure
S: Spain S: France
N: Johan Bilien N: Johan Bilien
E: jobi@via.ecp.fr E: jobi@via.ecp.fr
......
extras/Win32_msvc/defs.h
View file @ bf05a0e1
...@@ -91,6 +91,9 @@ ...@@ -91,6 +91,9 @@
/* Maximum supported data alignment */ /* Maximum supported data alignment */
#define ATTRIBUTE_ALIGNED_MAX 16 #define ATTRIBUTE_ALIGNED_MAX 16
/* iline */
#define inline __inline
/* Simple version string */ /* Simple version string */
#define VERSION_MESSAGE "vlc 0.3.1_2002-05-17 Ourumov Copyright 1996-2002 VideoLAN" #define VERSION_MESSAGE "vlc 0.3.1_2002-05-17 Ourumov Copyright 1996-2002 VideoLAN"
......
extras/Win32_msvc/modules_builtin_msvc.h
View file @ bf05a0e1
...@@ -106,9 +106,9 @@ int DeactivateModule__MODULE_mpeg_vdec( module_t* ); ...@@ -106,9 +106,9 @@ int DeactivateModule__MODULE_mpeg_vdec( module_t* );
int InitModule__MODULE_dvd( module_t* ); int InitModule__MODULE_dvd( module_t* );
int ActivateModule__MODULE_dvd( module_t* ); int ActivateModule__MODULE_dvd( module_t* );
int DeactivateModule__MODULE_dvd( module_t* ); int DeactivateModule__MODULE_dvd( module_t* );
int InitModule__MODULE_gtk( module_t* ); int InitModule__MODULE_wall( module_t* );
int ActivateModule__MODULE_gtk( module_t* ); int ActivateModule__MODULE_wall( module_t* );
int DeactivateModule__MODULE_gtk( module_t* ); int DeactivateModule__MODULE_wall( module_t* );
#define ALLOCATE_ALL_BUILTINS() \ #define ALLOCATE_ALL_BUILTINS() \
do \ do \
...@@ -136,4 +136,5 @@ int DeactivateModule__MODULE_gtk( module_t* ); ...@@ -136,4 +136,5 @@ int DeactivateModule__MODULE_gtk( module_t* );
ALLOCATE_BUILTIN(dummy); \ ALLOCATE_BUILTIN(dummy); \
ALLOCATE_BUILTIN(mpeg_vdec); \ ALLOCATE_BUILTIN(mpeg_vdec); \
ALLOCATE_BUILTIN(dvd); \ ALLOCATE_BUILTIN(dvd); \
ALLOCATE_BUILTIN(wall); \
} while( 0 ); } while( 0 );
extras/Win32_msvc/vlc.dsp
View file @ bf05a0e1
...@@ -66,7 +66,7 @@ LINK32=link.exe ...@@ -66,7 +66,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # 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 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 BASE RSC /l 0x414 /d "_DEBUG"
# ADD RSC /l 0x809 /i "../" /d "_DEBUG" # ADD RSC /l 0x809 /i "../" /d "_DEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
...@@ -499,7 +499,6 @@ SOURCE=..\..\plugins\filter\distort.c ...@@ -499,7 +499,6 @@ SOURCE=..\..\plugins\filter\distort.c
!ELSEIF "$(CFG)" == "vlc - Win32 Debug" !ELSEIF "$(CFG)" == "vlc - Win32 Debug"
# PROP Exclude_From_Build 1
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=distort # ADD CPP /D "__BUILTIN__" /D MODULE_NAME=distort
!ENDIF !ENDIF
...@@ -513,8 +512,6 @@ SOURCE=..\..\plugins\filter\filter_common.h ...@@ -513,8 +512,6 @@ SOURCE=..\..\plugins\filter\filter_common.h
!ELSEIF "$(CFG)" == "vlc - Win32 Debug" !ELSEIF "$(CFG)" == "vlc - Win32 Debug"
# PROP Exclude_From_Build 1
!ENDIF !ENDIF
# End Source File # End Source File
...@@ -528,7 +525,6 @@ SOURCE=..\..\plugins\filter\invert.c ...@@ -528,7 +525,6 @@ SOURCE=..\..\plugins\filter\invert.c
!ELSEIF "$(CFG)" == "vlc - Win32 Debug" !ELSEIF "$(CFG)" == "vlc - Win32 Debug"
# PROP Exclude_From_Build 1
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=insert # ADD CPP /D "__BUILTIN__" /D MODULE_NAME=insert
!ENDIF !ENDIF
...@@ -544,7 +540,6 @@ SOURCE=..\..\plugins\filter\transform.c ...@@ -544,7 +540,6 @@ SOURCE=..\..\plugins\filter\transform.c
!ELSEIF "$(CFG)" == "vlc - Win32 Debug" !ELSEIF "$(CFG)" == "vlc - Win32 Debug"
# PROP Exclude_From_Build 1
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=transform # ADD CPP /D "__BUILTIN__" /D MODULE_NAME=transform
!ENDIF !ENDIF
...@@ -560,7 +555,6 @@ SOURCE=..\..\plugins\filter\wall.c ...@@ -560,7 +555,6 @@ SOURCE=..\..\plugins\filter\wall.c
!ELSEIF "$(CFG)" == "vlc - Win32 Debug" !ELSEIF "$(CFG)" == "vlc - Win32 Debug"
# PROP Exclude_From_Build 1
# ADD CPP /D "__BUILTIN__" /D MODULE_NAME=wall # ADD CPP /D "__BUILTIN__" /D MODULE_NAME=wall
!ENDIF !ENDIF
......
plugins/filter/clone.c
View file @ bf05a0e1
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* clone.c : Clone video plugin for vlc * clone.c : Clone video plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 VideoLAN * 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> * Authors: Samuel Hocevar <sam@zoy.org>
* *
...@@ -222,7 +222,7 @@ static void vout_End( vout_thread_t *p_vout ) ...@@ -222,7 +222,7 @@ static void vout_End( vout_thread_t *p_vout )
for( i_index = I_OUTPUTPICTURES ; i_index ; ) for( i_index = I_OUTPUTPICTURES ; i_index ; )
{ {
i_index--; i_index--;
free( PP_OUTPUTPICTURE[ i_index ]->p_data ); free( PP_OUTPUTPICTURE[ i_index ]->p_data_orig );
} }
} }
......
plugins/filter/deinterlace.c
View file @ bf05a0e1
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* deinterlace.c : deinterlacer plugin for vlc * deinterlace.c : deinterlacer plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN * 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> * Authors: Samuel Hocevar <sam@zoy.org>
* *
...@@ -256,7 +256,7 @@ static void vout_End( vout_thread_t *p_vout ) ...@@ -256,7 +256,7 @@ static void vout_End( vout_thread_t *p_vout )
for( i_index = I_OUTPUTPICTURES ; i_index ; ) for( i_index = I_OUTPUTPICTURES ; i_index ; )
{ {
i_index--; i_index--;
free( PP_OUTPUTPICTURE[ i_index ]->p_data ); free( PP_OUTPUTPICTURE[ i_index ]->p_data_orig );
} }
} }
......
plugins/filter/distort.c
View file @ bf05a0e1
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* distort.c : Misc video effects plugin for vlc * distort.c : Misc video effects plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN * 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> * Authors: Samuel Hocevar <sam@zoy.org>
* *
...@@ -223,7 +223,7 @@ static void vout_End( vout_thread_t *p_vout ) ...@@ -223,7 +223,7 @@ static void vout_End( vout_thread_t *p_vout )
for( i_index = I_OUTPUTPICTURES ; i_index ; ) for( i_index = I_OUTPUTPICTURES ; i_index ; )
{ {
i_index--; i_index--;
free( PP_OUTPUTPICTURE[ i_index ]->p_data ); free( PP_OUTPUTPICTURE[ i_index ]->p_data_orig );
} }
} }
......
plugins/filter/invert.c
View file @ bf05a0e1
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* invert.c : Invert video plugin for vlc * invert.c : Invert video plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN * 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> * Authors: Samuel Hocevar <sam@zoy.org>
* *
...@@ -172,7 +172,7 @@ static void vout_End( vout_thread_t *p_vout ) ...@@ -172,7 +172,7 @@ static void vout_End( vout_thread_t *p_vout )
for( i_index = I_OUTPUTPICTURES ; i_index ; ) for( i_index = I_OUTPUTPICTURES ; i_index ; )
{ {
i_index--; i_index--;
free( PP_OUTPUTPICTURE[ i_index ]->p_data ); free( PP_OUTPUTPICTURE[ i_index ]->p_data_orig );
} }
} }
......
plugins/filter/transform.c
View file @ bf05a0e1
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* transform.c : transform image plugin for vlc * transform.c : transform image plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN * 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> * Authors: Samuel Hocevar <sam@zoy.org>
* *
...@@ -242,7 +242,7 @@ static void vout_End( vout_thread_t *p_vout ) ...@@ -242,7 +242,7 @@ static void vout_End( vout_thread_t *p_vout )
for( i_index = I_OUTPUTPICTURES ; i_index ; ) for( i_index = I_OUTPUTPICTURES ; i_index ; )
{ {
i_index--; i_index--;
free( PP_OUTPUTPICTURE[ i_index ]->p_data ); free( PP_OUTPUTPICTURE[ i_index ]->p_data_orig );
} }
} }
......
plugins/filter/wall.c
View file @ bf05a0e1
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* wall.c : Wall video plugin for vlc * wall.c : Wall video plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN * 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> * Authors: Samuel Hocevar <sam@zoy.org>
* *
...@@ -367,7 +367,7 @@ static void vout_End( vout_thread_t *p_vout ) ...@@ -367,7 +367,7 @@ static void vout_End( vout_thread_t *p_vout )
for( i_index = I_OUTPUTPICTURES ; i_index ; ) for( i_index = I_OUTPUTPICTURES ; i_index ; )
{ {
i_index--; i_index--;
free( PP_OUTPUTPICTURE[ i_index ]->p_data ); free( PP_OUTPUTPICTURE[ i_index ]->p_data_orig );
} }
} }
......
plugins/mpeg_vdec/video_parser.c
View file @ bf05a0e1
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* video_parser.c : video parser thread * video_parser.c : video parser thread
***************************************************************************** *****************************************************************************
* Copyright (C) 1999-2001 VideoLAN * 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> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* Samuel Hocevar <sam@via.ecp.fr> * Samuel Hocevar <sam@via.ecp.fr>
...@@ -92,8 +92,10 @@ void _M( vdec_getfunctions )( function_list_t * p_function_list ) ...@@ -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_TEXT N_("force synchro algorithm {I|I+|IP|IP+|IPB}")
#define VPAR_SYNCHRO_LONGTEXT N_( \ #define VPAR_SYNCHRO_LONGTEXT N_( \
"If you don't want this video decoder to decode all frames of the video, "\ "This allows you to force the synchro algorithm, by directly selecting " \
"you can specify which synchro algorithm you want to use.") "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 MODULE_CONFIG_START
ADD_CATEGORY_HINT( N_("Miscellaneous"), NULL) ADD_CATEGORY_HINT( N_("Miscellaneous"), NULL)
......
src/interface/main.c
View file @ bf05a0e1
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* and spawn threads. * and spawn threads.
***************************************************************************** *****************************************************************************
* Copyright (C) 1998-2001 VideoLAN * 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> * Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org> * Samuel Hocevar <sam@zoy.org>
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
#define INTF_TEXT N_("interface module") #define INTF_TEXT N_("interface module")
#define INTF_LONGTEXT N_( \ #define INTF_LONGTEXT N_( \
"This option allows you to select the interface used by vlc.\nNote that " \ "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.") "available.")
#define WARNING_TEXT N_("warning level (or use -v, -vv, etc...)") #define WARNING_TEXT N_("warning level (or use -v, -vv, etc...)")
...@@ -254,13 +254,11 @@ ...@@ -254,13 +254,11 @@
#define DVD_DEV_TEXT N_("DVD device") #define DVD_DEV_TEXT N_("DVD device")
#define DVD_DEV_LONGTEXT N_( \ #define DVD_DEV_LONGTEXT N_( \
"This is the default DVD device to use. Under UNIX it is /dev/dvd, under " \ "This is the default DVD device to use.")
"Windows it is D:.")
#define VCD_DEV_TEXT N_("VCD device") #define VCD_DEV_TEXT N_("VCD device")
#define VCD_DEV_LONGTEXT N_( \ #define VCD_DEV_LONGTEXT N_( \
"This is the default VCD device to use. Under UNIX it is /dev/dvd, under " \ "This is the default VCD device to use.")
"Windows it is D:.")
#define IPV6_TEXT N_("force IPv6") #define IPV6_TEXT N_("force IPv6")
#define IPV6_LONGTEXT N_( \ #define IPV6_LONGTEXT N_( \
...@@ -282,17 +280,6 @@ ...@@ -282,17 +280,6 @@
"This allows you to select the AC3/A52 audio decoder you want to use. " \ "This allows you to select the AC3/A52 audio decoder you want to use. " \
"Common choices are builtin and a52.") "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_TEXT N_("disable CPU's MMX support")
#define NOMMX_LONGTEXT N_( \ #define NOMMX_LONGTEXT N_( \
"If your processor supports the MMX instructions set but you don't want " \ "If your processor supports the MMX instructions set but you don't want " \
......
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