* ./evc/plugins.vcp.in: fixed plugin entry points for WinCE.

  * ./modules/*: fixed a bunch of modules so that they compile under WinCE,
    we now have access_file and the mpeg demux and video decoder working
    (http://zoy.org/~sam/vlc/pocketvlc2.png).

diff --git a/evc/config.h b/evc/config.h
index eb9914fa98c31c61691da06db342a0716b55ecda..7a257432c458f6ae3250c853e07e4e9f4bcc920b 100644 (file)
--- a/evc/config.h
+++ b/evc/config.h
@@ -334,7 +334,7 @@
 #define HAVE_STRUCT_TIMESPEC 1
 
 /* Define to 1 if you have the `swab' function. */
-#define HAVE_SWAB 1
+/* #define HAVE_SWAB 1 */
 
 /* Define to 1 if you have the <sys/int_types.h> header file. */
 /* #undef HAVE_SYS_INT_TYPES_H */

diff --git a/evc/plugins.vcp.in b/evc/plugins.vcp.in
index ae9096b2f02c34a89cff80a3353b2c800d3eae3d..9be2dd3b3d5155861a5a49db8ab401ea0a33b5a0 100644 (file)
--- a/evc/plugins.vcp.in
+++ b/evc/plugins.vcp.in
@@ -61,7 +61,7 @@ RSC=rc.exe
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "MIPS" /d "_MIPS_" /r\r
 CPP=clmips.exe\r
 # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /Oxs /M$(CECrtMT) /c\r
-# ADD CPP /nologo /W3 /I "." /I "..\include" /D "MIPS" /D "_MIPS_" /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_is_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /Oxs /M$(CECrtMT) /c\r
+# ADD CPP /nologo /W3 /I "." /I "..\include" /D "MIPS" /D "_MIPS_" /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_IS_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /Oxs /M$(CECrtMT) /c\r
 MTL=midl.exe\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32\r
@@ -70,7 +70,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:MIPS\r
-# ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"vlc_entry__0_5_0_cvs_am" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:MIPS\r
+# ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:MIPS\r
 \r
 !ELSEIF  "$(CFG)" == "plugin_§PLUGIN§ - Win32 (WCE MIPS) Debug"\r
 \r
@@ -94,7 +94,7 @@ RSC=rc.exe
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "MIPS" /d "_MIPS_" /r\r
 CPP=clmips.exe\r
 # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /M$(CECrtMTDebug) /c\r
-# ADD CPP /nologo /W3 /Zi /Od /I "." /I "..\include" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_is_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /M$(CECrtMTDebug) /c\r
+# ADD CPP /nologo /W3 /Zi /Od /I "." /I "..\include" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_IS_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /M$(CECrtMTDebug) /c\r
 MTL=midl.exe\r
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32\r
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32\r
@@ -103,7 +103,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:MIPS\r
-# ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"vlc_entry__0_5_0_cvs_am" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:MIPS\r
+# ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:MIPS\r
 \r
 !ELSEIF  "$(CFG)" == "plugin_§PLUGIN§ - Win32 (WCE SH4) Release"\r
 \r
@@ -127,7 +127,7 @@ RSC=rc.exe
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "SHx" /d "SH4" /d "_SH4_" /r\r
 CPP=shcl.exe\r
 # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH4" /D "_SH4_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /Qsh4 /Oxs /M$(CECrtMT) /c\r
-# ADD CPP /nologo /W3 /I "." /I "..\include" /D "SHx" /D "SH4" /D "_SH4_" /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_is_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /Qsh4 /Oxs /M$(CECrtMT) /c\r
+# ADD CPP /nologo /W3 /I "." /I "..\include" /D "SHx" /D "SH4" /D "_SH4_" /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_IS_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /Qsh4 /Oxs /M$(CECrtMT) /c\r
 MTL=midl.exe\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32\r
@@ -136,7 +136,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:SH4\r
-# ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"vlc_entry__0_5_0_cvs_am" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:SH4\r
+# ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:SH4\r
 \r
 !ELSEIF  "$(CFG)" == "plugin_§PLUGIN§ - Win32 (WCE SH4) Debug"\r
 \r
@@ -160,7 +160,7 @@ RSC=rc.exe
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "SHx" /d "SH4" /d "_SH4_" /r\r
 CPP=shcl.exe\r
 # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH4" /D "_SH4_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /Qsh4 /M$(CECrtMTDebug) /c\r
-# ADD CPP /nologo /W3 /Zi /Od /I "." /I "..\include" /D "DEBUG" /D "SHx" /D "SH4" /D "_SH4_" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_is_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /Qsh4 /M$(CECrtMTDebug) /c\r
+# ADD CPP /nologo /W3 /Zi /Od /I "." /I "..\include" /D "DEBUG" /D "SHx" /D "SH4" /D "_SH4_" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_IS_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /Qsh4 /M$(CECrtMTDebug) /c\r
 MTL=midl.exe\r
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32\r
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32\r
@@ -169,7 +169,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:SH4\r
-# ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"vlc_entry__0_5_0_cvs_am" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:SH4\r
+# ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:SH4\r
 \r
 !ELSEIF  "$(CFG)" == "plugin_§PLUGIN§ - Win32 (WCE SH3) Release"\r
 \r
@@ -193,7 +193,7 @@ RSC=rc.exe
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "SHx" /d "SH3" /d "_SH3_" /r\r
 CPP=shcl.exe\r
 # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /Oxs /M$(CECrtMT) /c\r
-# ADD CPP /nologo /W3 /I "." /I "..\include" /D "SHx" /D "SH3" /D "_SH3_" /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_is_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /Oxs /M$(CECrtMT) /c\r
+# ADD CPP /nologo /W3 /I "." /I "..\include" /D "SHx" /D "SH3" /D "_SH3_" /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_IS_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /Oxs /M$(CECrtMT) /c\r
 MTL=midl.exe\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32\r
@@ -202,7 +202,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:SH3\r
-# ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"vlc_entry__0_5_0_cvs_am" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:SH3\r
+# ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:SH3\r
 \r
 !ELSEIF  "$(CFG)" == "plugin_§PLUGIN§ - Win32 (WCE SH3) Debug"\r
 \r
@@ -226,7 +226,7 @@ RSC=rc.exe
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "SHx" /d "SH3" /d "_SH3_" /r\r
 CPP=shcl.exe\r
 # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /M$(CECrtMTDebug) /c\r
-# ADD CPP /nologo /W3 /Zi /Od /I "." /I "..\include" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_is_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /M$(CECrtMTDebug) /c\r
+# ADD CPP /nologo /W3 /Zi /Od /I "." /I "..\include" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_IS_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /M$(CECrtMTDebug) /c\r
 MTL=midl.exe\r
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32\r
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32\r
@@ -235,7 +235,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:SH3\r
-# ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"vlc_entry__0_5_0_cvs_am" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:SH3\r
+# ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /MACHINE:SH3\r
 \r
 !ELSEIF  "$(CFG)" == "plugin_§PLUGIN§ - Win32 (WCE ARM) Release"\r
 \r
@@ -259,7 +259,7 @@ RSC=rc.exe
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r\r
 CPP=clarm.exe\r
 # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /Oxs /M$(CECrtMT) /c\r
-# ADD CPP /nologo /W3 /I "." /I "..\include" /D "ARM" /D "_ARM_" /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_is_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /Oxs /M$(CECrtMT) /c\r
+# ADD CPP /nologo /W3 /I "." /I "..\include" /D "ARM" /D "_ARM_" /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_IS_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /Oxs /M$(CECrtMT) /c\r
 MTL=midl.exe\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32\r
@@ -268,7 +268,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM\r
-# ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"vlc_entry__0_5_0_cvs_am" /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM\r
+# ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /dll /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM\r
 \r
 !ELSEIF  "$(CFG)" == "plugin_§PLUGIN§ - Win32 (WCE ARM) Debug"\r
 \r
@@ -292,7 +292,7 @@ RSC=rc.exe
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r\r
 CPP=clarm.exe\r
 # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /M$(CECrtMTDebug) /c\r
-# ADD CPP /nologo /W3 /Zi /Od /I "." /I "..\include" /D "DEBUG" /D "ARM" /D "_ARM_" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_is_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /M$(CECrtMTDebug) /c\r
+# ADD CPP /nologo /W3 /Zi /Od /I "." /I "..\include" /D "DEBUG" /D "ARM" /D "_ARM_" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_IS_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /M$(CECrtMTDebug) /c\r
 MTL=midl.exe\r
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32\r
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32\r
@@ -301,7 +301,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"_DllMainCRTStartup" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM\r
-# ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /entry:"vlc_entry__0_5_0_cvs_am" /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM\r
+# ADD LINK32 commctrl.lib coredll.lib /nologo /base:"0x00100000" /stack:0x10000,0x1000 /dll /debug /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /align:"4096" /MACHINE:ARM\r
 \r
 !ELSEIF  "$(CFG)" == "plugin_§PLUGIN§ - Win32 (WCE x86em) Release"\r
 \r
@@ -325,7 +325,7 @@ RSC=rc.exe
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "i486" /r\r
 CPP=cl.exe\r
 # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "$(CePlatform)" /D "i486" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_USRDLL" /Gz /Oxs /c\r
-# ADD CPP /nologo /W3 /I "." /I "..\include" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "i486" /D "_X86_" /D "x86" /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_is_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /Gz /Oxs /c\r
+# ADD CPP /nologo /W3 /I "." /I "..\include" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "i486" /D "_X86_" /D "x86" /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_IS_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /Gz /Oxs /c\r
 MTL=midl.exe\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32\r
@@ -334,7 +334,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) /nologo /stack:0x10000,0x1000 /dll /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /windowsce:emulation /MACHINE:IX86\r
-# ADD LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) /nologo /stack:0x10000,0x1000 /entry:"vlc_entry__0_5_0_cvs_am" /dll /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /windowsce:emulation /MACHINE:IX86\r
+# ADD LINK32 commctrl.lib coredll.lib $(CEx86Corelibc) /nologo /stack:0x10000,0x1000 /dll /nodefaultlib:"OLDNAMES.lib" /nodefaultlib:$(CENoDefaultLib) /windowsce:emulation /MACHINE:IX86\r
 \r
 !ELSEIF  "$(CFG)" == "plugin_§PLUGIN§ - Win32 (WCE x86em) Debug"\r
 \r
@@ -358,7 +358,7 @@ RSC=rc.exe
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "i486" /r\r
 CPP=cl.exe\r
 # ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "$(CePlatform)" /D "i486" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "_USRDLL" /Gz /c\r
-# ADD CPP /nologo /W3 /Zi /Od /I "." /I "..\include" /D "DEBUG" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "i486" /D "_X86_" /D "x86" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_is_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /Gz /c\r
+# ADD CPP /nologo /W3 /Zi /Od /I "." /I "..\include" /D "DEBUG" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "i486" /D "_X86_" /D "x86" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_IS_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /Gz /c\r
 MTL=midl.exe\r
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32\r
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32\r

diff --git a/evc/vlc.c b/evc/vlc.c
index bd62d392b91d9c7e0c5055d56f040bdd0b30e086..fe9334730953775c6dda4da00f1d1e6d91b5200d 100644 (file)
--- a/evc/vlc.c
+++ b/evc/vlc.c
@@ -2,7 +2,7 @@
  * vlc.c: the vlc player, WinCE version
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: vlc.c,v 1.2 2002/11/13 20:51:04 sam Exp $
+ * $Id: vlc.c,v 1.3 2002/11/20 13:37:35 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -52,8 +52,8 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
                     LPTSTR lpCmdLine, int nCmdShow )
 {
     int    i_ret;
-    int    i_argc = 2;
-    char * ppsz_argv[] = { lpCmdLine, "-vv", NULL };
+    int    i_argc = 5;
+    char * ppsz_argv[] = { lpCmdLine, "-vv", "--intf", "dummy", "shovel.mpeg", NULL };
     HWND   window;
     MSG    message;
 

diff --git a/evc/vlc.vcw b/evc/vlc.vcw
index 17cbe4df028e47d07f7cfc1b1ea684461a9fce5c..4a971467a2157ed39886e89743ade429391f8ad7 100644 (file)
--- a/evc/vlc.vcw
+++ b/evc/vlc.vcw
@@ -15,6 +15,42 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
+Project: "plugin_a52tospdif"=.\plugin_a52tospdif.vcp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "plugin_access_file"=.\plugin_access_file.vcp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "plugin_access_http"=.\plugin_access_http.vcp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
 Project: "plugin_dummy"=.\plugin_dummy.vcp - Package Owner=<4>\r
 \r
 Package=<5>\r
@@ -27,6 +63,186 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
+Project: "plugin_es"=.\plugin_es.vcp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "plugin_i420_rgb"=.\plugin_i420_rgb.vcp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "plugin_i420_yuy2"=.\plugin_i420_yuy2.vcp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "plugin_i422_yuy2"=.\plugin_i422_yuy2.vcp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "plugin_idct"=.\plugin_idct.vcp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "plugin_idctclassic"=.\plugin_idctclassic.vcp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "plugin_ipv4"=.\plugin_ipv4.vcp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "plugin_memcpy"=.\plugin_memcpy.vcp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "plugin_motion"=.\plugin_motion.vcp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "plugin_mpeg_audio"=.\plugin_mpeg_audio.vcp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "plugin_mpeg_system"=.\plugin_mpeg_system.vcp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "plugin_mpeg_video"=.\plugin_mpeg_video.vcp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "plugin_ps"=.\plugin_ps.vcp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "plugin_spudec"=.\plugin_spudec.vcp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
+Project: "plugin_ts"=.\plugin_ts.vcp - Package Owner=<4>\r
+\r
+Package=<5>\r
+{{{\r
+}}}\r
+\r
+Package=<4>\r
+{{{\r
+}}}\r
+\r
+###############################################################################\r
+\r
 Project: "vlc"=.\vlc.vcp - Package Owner=<4>\r
 \r
 Package=<5>\r

diff --git a/include/video.h b/include/video.h
index 10f4f228aad69bb03e955af2d091732d07112b3a..89de71a0111fca2bc1073e312171d9c8d926b44b 100644 (file)
--- a/include/video.h
+++ b/include/video.h
@@ -4,7 +4,7 @@
  * includes all common video types and constants.
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: video.h,v 1.59 2002/11/19 20:45:08 gbazin Exp $
+ * $Id: video.h,v 1.60 2002/11/20 13:37:35 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *
@@ -95,10 +95,10 @@ struct picture_heap_t
 
     /* Picture static properties - those properties are fixed at initialization
      * and should NOT be modified */
-    int          i_width;                                   /* picture width */
-    int          i_height;                                 /* picture height */
+    unsigned int i_width;                                   /* picture width */
+    unsigned int i_height;                                 /* picture height */
     vlc_fourcc_t i_chroma;                                 /* picture chroma */
-    int          i_aspect;                                   /* aspect ratio */
+    unsigned int i_aspect;                                   /* aspect ratio */
 
     /* Real pictures */
     picture_t*      pp_picture[VOUT_MAX_PICTURES];               /* pictures */

diff --git a/include/video_output.h b/include/video_output.h
index 1d386795543442f1309ee93a49ebe138cdd93591..3cb85b7df406a84fdb4b70fdbb7764ee7599b9c7 100644 (file)
--- a/include/video_output.h
+++ b/include/video_output.h
@@ -5,7 +5,7 @@
  * thread, and destroy a previously opened video output thread.
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: video_output.h,v 1.86 2002/11/11 14:39:11 sam Exp $
+ * $Id: video_output.h,v 1.87 2002/11/20 13:37:35 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@via.ecp.fr>
@@ -142,7 +142,7 @@ struct vout_thread_t
  * Prototypes
  *****************************************************************************/
 #define vout_CreateThread(a,b,c,d,e) __vout_CreateThread(VLC_OBJECT(a),b,c,d,e)
-VLC_EXPORT( vout_thread_t *, __vout_CreateThread,   ( vlc_object_t *, int, int, uint32_t, int ) );
+VLC_EXPORT( vout_thread_t *, __vout_CreateThread,   ( vlc_object_t *, unsigned int, unsigned int, uint32_t, unsigned int ) );
 VLC_EXPORT( void,              vout_DestroyThread,  ( vout_thread_t * ) );
 
 VLC_EXPORT( int,             vout_ChromaCmp,      ( uint32_t, uint32_t ) );
@@ -154,7 +154,7 @@ VLC_EXPORT( void,            vout_DisplayPicture, ( vout_thread_t *, picture_t *
 VLC_EXPORT( void,            vout_DatePicture,    ( vout_thread_t *, picture_t *, mtime_t ) );
 VLC_EXPORT( void,            vout_LinkPicture,    ( vout_thread_t *, picture_t * ) );
 VLC_EXPORT( void,            vout_UnlinkPicture,  ( vout_thread_t *, picture_t * ) );
-VLC_EXPORT( void,            vout_PlacePicture,   ( vout_thread_t *, int, int, int *, int *, int *, int * ) );
+VLC_EXPORT( void,            vout_PlacePicture,   ( vout_thread_t *, unsigned int, unsigned int, unsigned int *, unsigned int *, unsigned int *, unsigned int * ) );
 picture_t *     vout_RenderPicture  ( vout_thread_t *, picture_t *,
                                                        subpicture_t * );
 

diff --git a/modules/access/file.c b/modules/access/file.c
index 170c1397e4423827c0cc7dfb306114d2032fb82a..1714b79971c00274518bab546f6c6b4b38317919 100644 (file)
--- a/modules/access/file.c
+++ b/modules/access/file.c
@@ -2,7 +2,7 @@
  * file.c: file input (file: access plug-in)
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: file.c,v 1.3 2002/11/12 13:57:12 sam Exp $
+ * $Id: file.c,v 1.4 2002/11/20 13:37:35 sam Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -24,16 +24,24 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <string.h>
-#include <errno.h>
-#include <fcntl.h>
-
 #include <vlc/vlc.h>
 #include <vlc/input.h>
 
+#include <stdlib.h>
+#include <string.h>
+#ifdef HAVE_SYS_TYPES_H
+#   include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+#   include <sys/stat.h>
+#endif
+#ifdef HAVE_ERRNO_H
+#   include <errno.h>
+#endif
+#ifdef HAVE_FCNTL_H
+#   include <fcntl.h>
+#endif
+
 #ifdef HAVE_UNISTD_H
 #   include <unistd.h>
 #elif defined( _MSC_VER ) && defined( _WIN32 ) && !defined( UNDER_CE )
@@ -67,8 +75,10 @@ static int Open( vlc_object_t *p_this )
 {
     input_thread_t *    p_input = (input_thread_t *)p_this;
     char *              psz_name = p_input->psz_name;
+#ifdef HAVE_SYS_STAT_H
     int                 i_stat;
     struct stat         stat_info;                                              
+#endif
     input_socket_t *    p_access_data;
     vlc_bool_t          b_stdin;
 
@@ -76,12 +86,18 @@ static int Open( vlc_object_t *p_this )
 
     b_stdin = psz_name[0] == '-' && psz_name[1] == '\0';
 
+#ifdef HAVE_SYS_STAT_H
     if( !b_stdin && (i_stat = stat( psz_name, &stat_info )) == (-1) )
     {
+#   ifdef HAVE_ERRNO_H
         msg_Err( p_input, "cannot stat() file `%s' (%s)",
                           psz_name, strerror(errno));
+#   else
+        msg_Err( p_input, "cannot stat() file `%s'", psz_name );
+#   endif
         return VLC_EGENERIC;
     }
+#endif
 
     p_input->pf_read = Read;
     p_input->pf_set_program = input_SetProgram;
@@ -107,6 +123,7 @@ static int Open( vlc_object_t *p_this )
             p_input->stream.b_seekable = 0;
             p_input->stream.p_selected_area->i_size = 0;
         }
+#ifdef HAVE_SYS_STAT_H
         else if( S_ISREG(stat_info.st_mode) || S_ISCHR(stat_info.st_mode)
                   || S_ISBLK(stat_info.st_mode) )
         {
@@ -114,9 +131,9 @@ static int Open( vlc_object_t *p_this )
             p_input->stream.p_selected_area->i_size = stat_info.st_size;
         }
         else if( S_ISFIFO(stat_info.st_mode)
-#if !defined( SYS_BEOS ) && !defined( WIN32 )
+#   if !defined( SYS_BEOS ) && !defined( WIN32 )
                   || S_ISSOCK(stat_info.st_mode)
-#endif
+#   endif
                )
         {
             p_input->stream.b_seekable = 0;
@@ -128,6 +145,7 @@ static int Open( vlc_object_t *p_this )
             msg_Err( p_input, "unknown file type for `%s'", psz_name );
             return VLC_EGENERIC;
         }
+#endif
     }
  
     p_input->stream.p_selected_area->i_tell = 0;
@@ -147,13 +165,37 @@ static int Open( vlc_object_t *p_this )
     {
         p_access_data->i_handle = 0;
     }
-    else if( (p_access_data->i_handle = open( psz_name,
-                                   /*O_NONBLOCK | O_LARGEFILE*/ 0 )) == (-1) )
+    else
     {
-        msg_Err( p_input, "cannot open file %s (%s)", psz_name,
-                          strerror(errno) );
-        free( p_access_data );
-        return VLC_EGENERIC;
+#ifdef UNDER_CE
+        wchar_t psz_filename[MAX_PATH];
+        MultiByteToWideChar( CP_ACP, 0, psz_name, -1, psz_filename, MAX_PATH );
+
+        p_access_data->i_handle = (int)CreateFile( psz_filename,
+            GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 
+            FILE_ATTRIBUTE_NORMAL, NULL );
+
+        if( (HANDLE)p_access_data->i_handle == INVALID_HANDLE_VALUE )
+        {
+            msg_Err( p_input, "cannot open file %s", psz_name );
+            free( p_access_data );
+            return VLC_EGENERIC;
+        }
+#else
+        p_access_data->i_handle = open( psz_name,
+                                        /*O_NONBLOCK | O_LARGEFILE*/ 0 );
+        if( p_access_data->i_handle == -1 )
+        {
+#   ifdef HAVE_ERRNO_H
+            msg_Err( p_input, "cannot open file %s (%s)", psz_name,
+                              strerror(errno) );
+#   else
+            msg_Err( p_input, "cannot open file %s", psz_name );
+#   endif
+            free( p_access_data );
+            return VLC_EGENERIC;
+        }
+#endif
     }
 
     return VLC_SUCCESS;
@@ -189,7 +231,7 @@ static ssize_t Read( input_thread_t * p_input, byte_t * p_buffer, size_t i_len )
  
 #ifdef UNDER_CE
     if( !ReadFile( (HANDLE)p_access_data->i_handle, p_buffer, i_len,
-                   (LPWORD)&i_ret, NULL ) )
+                   (LPDWORD)&i_ret, NULL ) )
     {
         i_ret = -1;
     }

diff --git a/modules/audio_filter/converter/a52tospdif.c b/modules/audio_filter/converter/a52tospdif.c
index 156e8705c267b8a03b72d045925075faae15f1d6..d1b8801f45758c13ff0c38fdabe363d818839a1b 100644 (file)
--- a/modules/audio_filter/converter/a52tospdif.c
+++ b/modules/audio_filter/converter/a52tospdif.c
@@ -2,7 +2,7 @@
  * a52tospdif.c : encapsulates A/52 frames into S/PDIF packets
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: a52tospdif.c,v 1.13 2002/09/30 21:32:32 massiot Exp $
+ * $Id: a52tospdif.c,v 1.14 2002/11/20 13:37:35 sam Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Stéphane Borel <stef@via.ecp.fr>
@@ -25,7 +25,6 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <errno.h>
 #include <stdlib.h>                                      /* malloc(), free() */
 #include <string.h>
 

diff --git a/modules/codec/mpeg_video/decoder.c b/modules/codec/mpeg_video/decoder.c
index 2ff275bed8e2915356c047c5b8ac5ae23562af8f..1b332e4c359bd5db51362a5c4e56f3bd3e9fb611 100644 (file)
--- a/modules/codec/mpeg_video/decoder.c
+++ b/modules/codec/mpeg_video/decoder.c
@@ -2,7 +2,7 @@
  * video_decoder.c : video decoder thread
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: decoder.c,v 1.4 2002/08/29 23:53:22 massiot Exp $
+ * $Id: decoder.c,v 1.5 2002/11/20 13:37:35 sam Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Michel Lespinasse <walken@zoy.org>
@@ -27,12 +27,14 @@
  *****************************************************************************/
 #include <stdlib.h>                                                /* free() */
 #include <string.h>                                    /* memcpy(), memset() */
-#include <errno.h>                                                  /* errno */
 
 #include <vlc/vlc.h>
 #include <vlc/vout.h>
 #include <vlc/decoder.h>
 
+#ifdef HAVE_ERRNO_H
+#   include <errno.h>                                               /* errno */
+#endif
 #ifdef HAVE_UNISTD_H
 #   include <unistd.h>                                           /* getpid() */
 #endif
@@ -123,7 +125,11 @@ void vdec_InitThread( vdec_thread_t * p_vdec )
     if( 0 )
 #endif
     {
+#ifdef HAVE_ERRNO_H
         msg_Warn( p_vdec, "couldn't nice() (%s)", strerror(errno) );
+#else
+        msg_Warn( p_vdec, "couldn't nice()" );
+#endif
     }
 
     p_vdec->p_idct_data = NULL;

diff --git a/modules/codec/mpeg_video/headers.c b/modules/codec/mpeg_video/headers.c
index 164b20452274db010733ae56339dd15e6cd1a2e6..b6e27163a9fdb381ab8747c6edeafdff73b4d50e 100644 (file)
--- a/modules/codec/mpeg_video/headers.c
+++ b/modules/codec/mpeg_video/headers.c
@@ -2,7 +2,7 @@
  * vpar_headers.c : headers parsing
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: headers.c,v 1.4 2002/10/23 22:05:22 massiot Exp $
+ * $Id: headers.c,v 1.5 2002/11/20 13:37:35 sam Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Stéphane Borel <stef@via.ecp.fr>
@@ -207,7 +207,7 @@ static inline void LinkMatrix( quant_matrix_t * p_matrix, u8 * pi_array )
 /*****************************************************************************
  * ChromaToFourCC: Return a FourCC value used by the video output.
  *****************************************************************************/
-static inline u64 ChromaToFourCC( int i_chroma )
+static inline vlc_fourcc_t ChromaToFourCC( int i_chroma )
 {
     switch( i_chroma )
     {

diff --git a/modules/codec/mpeg_video/idct/idct.c b/modules/codec/mpeg_video/idct/idct.c
index 9dad3a9ccfa213a9e55cb379fe75e706cc994b68..11164ece989a8dacdac96b8a784f4361e3c46704 100644 (file)
--- a/modules/codec/mpeg_video/idct/idct.c
+++ b/modules/codec/mpeg_video/idct/idct.c
@@ -2,7 +2,7 @@
  * idct.c : C IDCT module
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: idct.c,v 1.1 2002/08/04 17:23:42 sam Exp $
+ * $Id: idct.c,v 1.2 2002/11/20 13:37:35 sam Exp $
  *
  * Author: Gaël Hendryckx <jimmy@via.ecp.fr>
  *
@@ -58,10 +58,10 @@ static void NormScan( u8 ppi_scan[2][64] )
  *****************************************************************************/
 static inline void IDCT( dctelem_t * p_block )
 {
-    s32 tmp0, tmp1, tmp2, tmp3;
-    s32 tmp10, tmp11, tmp12, tmp13;
-    s32 z1, z2, z3, z4, z5;
-    s32 d0, d1, d2, d3, d4, d5, d6, d7;
+    int32_t tmp0, tmp1, tmp2, tmp3;
+    int32_t tmp10, tmp11, tmp12, tmp13;
+    int32_t z1, z2, z3, z4, z5;
+    int32_t d0, d1, d2, d3, d4, d5, d6, d7;
     dctelem_t * dataptr;
     int rowctr;
 

diff --git a/modules/codec/mpeg_video/parser.c b/modules/codec/mpeg_video/parser.c
index ed53cc0daae2f42e292d07139e9af7b1fed7f44e..617fe2c0ae44b9655ff9b89792dbe4d5d2f0d548 100644 (file)
--- a/modules/codec/mpeg_video/parser.c
+++ b/modules/codec/mpeg_video/parser.c
@@ -2,7 +2,7 @@
  * video_parser.c : video parser thread
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: parser.c,v 1.6 2002/10/28 22:23:23 gbazin Exp $
+ * $Id: parser.c,v 1.7 2002/11/20 13:37:35 sam Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Samuel Hocevar <sam@via.ecp.fr>
@@ -35,9 +35,6 @@
 #include <unistd.h>                                              /* getpid() */
 #endif
 
-#include <errno.h>
-#include <string.h>
-
 #ifdef HAVE_SYS_TIMES_H
 #   include <sys/times.h>
 #endif

diff --git a/modules/demux/mpeg/es.c b/modules/demux/mpeg/es.c
index af134652788b7b2491b0098008883547d4f61a5f..32afbf54333e60ddb1b495147e06af12d1ecfd19 100644 (file)
--- a/modules/demux/mpeg/es.c
+++ b/modules/demux/mpeg/es.c
@@ -2,7 +2,7 @@
  * mpeg_es.c : Elementary Stream input module for vlc
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: es.c,v 1.1 2002/08/04 17:23:42 sam Exp $
+ * $Id: es.c,v 1.2 2002/11/20 13:37:36 sam Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -26,13 +26,10 @@
  *****************************************************************************/
 #include <stdlib.h>                                      /* malloc(), free() */
 #include <string.h>                                              /* strdup() */
-#include <errno.h>
 
 #include <vlc/vlc.h>
 #include <vlc/input.h>
 
-#include <sys/types.h>
-
 /*****************************************************************************
  * Constants
  *****************************************************************************/

diff --git a/modules/demux/mpeg/ps.c b/modules/demux/mpeg/ps.c
index 891f2dbe655dc6be0a4f0ac3a272fbe0defefab4..195e4640c8bb3153e17d74831023f526763b1e6b 100644 (file)
--- a/modules/demux/mpeg/ps.c
+++ b/modules/demux/mpeg/ps.c
@@ -2,7 +2,7 @@
  * ps.c : Program Stream input module for vlc
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: ps.c,v 1.5 2002/08/30 22:22:24 massiot Exp $
+ * $Id: ps.c,v 1.6 2002/11/20 13:37:36 sam Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -26,13 +26,10 @@
  *****************************************************************************/
 #include <stdlib.h>                                      /* malloc(), free() */
 #include <string.h>                                              /* strdup() */
-#include <errno.h>
 
 #include <vlc/vlc.h>
 #include <vlc/input.h>
 
-#include <sys/types.h>
-
 #include "system.h"
 
 /*****************************************************************************

diff --git a/modules/demux/mpeg/system.c b/modules/demux/mpeg/system.c
index dd8f963f42b293488644402c3f418aa38c2fe49a..2a7a287e456fd7dc61b00d1fd48698f5097610b7 100644 (file)
--- a/modules/demux/mpeg/system.c
+++ b/modules/demux/mpeg/system.c
@@ -2,7 +2,7 @@
  * system.c: helper module for TS, PS and PES management
  *****************************************************************************
  * Copyright (C) 1998-2002 VideoLAN
- * $Id: system.c,v 1.6 2002/10/20 12:23:48 massiot Exp $
+ * $Id: system.c,v 1.7 2002/11/20 13:37:36 sam Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Michel Lespinasse <walken@via.ecp.fr>
@@ -30,7 +30,6 @@
  *****************************************************************************/
 #include <stdlib.h>
 #include <string.h>                                    /* memcpy(), memset() */
-#include <sys/types.h>                                              /* off_t */
 
 #include <vlc/vlc.h>
 #include <vlc/input.h>

diff --git a/modules/demux/mpeg/ts.c b/modules/demux/mpeg/ts.c
index ba1b59194e766eff51ea892ecc6c8f1d933178ad..c0c418d6028464275a2ff0465859e9c6a47c9b2f 100644 (file)
--- a/modules/demux/mpeg/ts.c
+++ b/modules/demux/mpeg/ts.c
@@ -2,7 +2,7 @@
  * mpeg_ts.c : Transport Stream input module for vlc
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: ts.c,v 1.8 2002/10/20 12:23:48 massiot Exp $
+ * $Id: ts.c,v 1.9 2002/11/20 13:37:36 sam Exp $
  *
  * Authors: Henri Fallon <henri@via.ecp.fr>
  *          Johan Bilien <jobi@via.ecp.fr>
@@ -27,7 +27,6 @@
  *****************************************************************************/
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
 
 #ifdef HAVE_STDINT_H
 #   include <stdint.h>                                            /* uint8_t */

diff --git a/modules/video_chroma/i420_rgb.c b/modules/video_chroma/i420_rgb.c
index e2475e9d6b55be0693b9b3612c450ea3d80944c8..b3f4c0f29da7647ab7b0773a9b13dba15f17ced4 100644 (file)
--- a/modules/video_chroma/i420_rgb.c
+++ b/modules/video_chroma/i420_rgb.c
@@ -2,7 +2,7 @@
  * i420_rgb.c : YUV to bitmap RGB conversion module for vlc
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: i420_rgb.c,v 1.1 2002/08/04 17:23:43 sam Exp $
+ * $Id: i420_rgb.c,v 1.2 2002/11/20 13:37:36 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -25,7 +25,6 @@
  * Preamble
  *****************************************************************************/
 #include <math.h>                                            /* exp(), pow() */
-#include <errno.h>                                                 /* ENOMEM */
 #include <string.h>                                            /* strerror() */
 #include <stdlib.h>                                      /* malloc(), free() */
 
@@ -226,7 +225,7 @@ static void SetGammaTable( int *pi_table, double f_gamma )
     /* Build gamma table */
     for( i_y = 0; i_y < 256; i_y++ )
     {
-        pi_table[ i_y ] = pow( (double)i_y / 256, f_gamma ) * 256;
+        pi_table[ i_y ] = (int)( pow( (double)i_y / 256, f_gamma ) * 256 );
     }
 }
 

diff --git a/modules/video_chroma/i420_rgb16.c b/modules/video_chroma/i420_rgb16.c
index 070324d4f6b418ddcdd9802264acd6b31728b54f..db4b9ad0d8bf8637fc1f8f68809a301854320b9f 100644 (file)
--- a/modules/video_chroma/i420_rgb16.c
+++ b/modules/video_chroma/i420_rgb16.c
@@ -2,7 +2,7 @@
  * i420_rgb16.c : YUV to bitmap RGB conversion module for vlc
  *****************************************************************************
  * Copyright (C) 2000 VideoLAN
- * $Id: i420_rgb16.c,v 1.1 2002/08/04 17:23:43 sam Exp $
+ * $Id: i420_rgb16.c,v 1.2 2002/11/20 13:37:36 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -24,7 +24,6 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <errno.h>                                                 /* ENOMEM */
 #include <string.h>                                            /* strerror() */
 #include <stdlib.h>                                      /* malloc(), free() */
 
@@ -59,9 +58,10 @@ void E_(I420_RGB15)( vout_thread_t *p_vout, picture_t *p_src,
     u8  *p_u   = p_src->U_PIXELS;
     u8  *p_v   = p_src->V_PIXELS;
 
-    vlc_bool_t  b_hscale;                         /* horizontal scaling type */
-    int         i_vscale;                           /* vertical scaling type */
-    int         i_x, i_y;                 /* horizontal and vertical indexes */
+    vlc_bool_t   b_hscale;                        /* horizontal scaling type */
+    int          i_vscale;                          /* vertical scaling type */
+    unsigned int i_x, i_y;                /* horizontal and vertical indexes */
+
     int         i_right_margin;
     int         i_rewind;
     int         i_scale_count;                       /* scale modulo counter */
@@ -188,8 +188,9 @@ void E_(I420_RGB16)( vout_thread_t *p_vout, picture_t *p_src,
     u8  *p_v   = p_src->V_PIXELS;
 
     vlc_bool_t  b_hscale;                         /* horizontal scaling type */
-    int         i_vscale;                           /* vertical scaling type */
-    int         i_x, i_y;                 /* horizontal and vertical indexes */
+    unsigned int i_vscale;                          /* vertical scaling type */
+    unsigned int i_x, i_y;                /* horizontal and vertical indexes */
+
     int         i_right_margin;
     int         i_rewind;
     int         i_scale_count;                       /* scale modulo counter */
@@ -316,8 +317,9 @@ void E_(I420_RGB32)( vout_thread_t *p_vout, picture_t *p_src,
     u8  *p_v   = p_src->V_PIXELS;
 
     vlc_bool_t  b_hscale;                         /* horizontal scaling type */
-    int         i_vscale;                           /* vertical scaling type */
-    int         i_x, i_y;                 /* horizontal and vertical indexes */
+    unsigned int i_vscale;                          /* vertical scaling type */
+    unsigned int i_x, i_y;                /* horizontal and vertical indexes */
+
     int         i_right_margin;
     int         i_rewind;
     int         i_scale_count;                       /* scale modulo counter */

diff --git a/modules/video_chroma/i420_rgb8.c b/modules/video_chroma/i420_rgb8.c
index 6b643b489eef05254d32a4f37828bff23a8160b4..ce2e0d5f5a31e2f9b0f5d6ca430ab8b3d46aae2f 100644 (file)
--- a/modules/video_chroma/i420_rgb8.c
+++ b/modules/video_chroma/i420_rgb8.c
@@ -2,7 +2,7 @@
  * i420_rgb8.c : YUV to bitmap RGB conversion module for vlc
  *****************************************************************************
  * Copyright (C) 2000 VideoLAN
- * $Id: i420_rgb8.c,v 1.1 2002/08/04 17:23:43 sam Exp $
+ * $Id: i420_rgb8.c,v 1.2 2002/11/20 13:37:36 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -24,7 +24,6 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <errno.h>                                                 /* ENOMEM */
 #include <string.h>                                            /* strerror() */
 #include <stdlib.h>                                      /* malloc(), free() */
 
@@ -47,13 +46,13 @@ void E_(I420_RGB8)( vout_thread_t *p_vout, picture_t *p_src, picture_t *p_dest )
     u8 *p_u   = p_src->U_PIXELS;
     u8 *p_v   = p_src->V_PIXELS;
 
-    vlc_bool_t  b_hscale;             /* horizontal scaling type */
-    int         i_vscale;                 /* vertical scaling type */
-    int         i_x, i_y;                 /* horizontal and vertical indexes */
-    int         i_real_y;                                           /* y % 4 */
-    int         i_right_margin;
-    int         i_scale_count;                       /* scale modulo counter */
-    int         i_chroma_width = p_vout->render.i_width / 2; /* chroma width */
+    vlc_bool_t  b_hscale;                         /* horizontal scaling type */
+    unsigned int i_vscale;                          /* vertical scaling type */
+    unsigned int i_x, i_y;                /* horizontal and vertical indexes */
+    unsigned int i_real_y;                                          /* y % 4 */
+    int          i_right_margin;
+    int          i_scale_count;                      /* scale modulo counter */
+    unsigned int i_chroma_width = p_vout->render.i_width / 2;/* chroma width */
 
     /* Lookup table */
     u8 *        p_lookup = p_vout->chroma.p_sys->p_base;

diff --git a/modules/video_chroma/i420_yuy2.c b/modules/video_chroma/i420_yuy2.c
index 9aa3acb5cdfee7183562061cba2fb57a3690be2b..ea4158ba5f9ac4f0059938a06626138968d8d20e 100644 (file)
--- a/modules/video_chroma/i420_yuy2.c
+++ b/modules/video_chroma/i420_yuy2.c
@@ -2,7 +2,7 @@
  * i420_yuy2.c : YUV to YUV conversion module for vlc
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: i420_yuy2.c,v 1.1 2002/08/04 17:23:43 sam Exp $
+ * $Id: i420_yuy2.c,v 1.2 2002/11/20 13:37:36 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -24,7 +24,6 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <errno.h>                                                 /* ENOMEM */
 #include <string.h>                                            /* strerror() */
 #include <stdlib.h>                                      /* malloc(), free() */
 

diff --git a/modules/video_chroma/i422_yuy2.c b/modules/video_chroma/i422_yuy2.c
index 2b50b840a359bc4e0464661fc7ca6162902ed3c1..6bf6031e623d9e4e82fa985a194c4cce809b3e47 100644 (file)
--- a/modules/video_chroma/i422_yuy2.c
+++ b/modules/video_chroma/i422_yuy2.c
@@ -2,7 +2,7 @@
  * i422_yuy2.c : YUV to YUV conversion module for vlc
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: i422_yuy2.c,v 1.1 2002/08/04 17:23:43 sam Exp $
+ * $Id: i422_yuy2.c,v 1.2 2002/11/20 13:37:36 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -24,7 +24,6 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <errno.h>                                                 /* ENOMEM */
 #include <string.h>                                            /* strerror() */
 #include <stdlib.h>                                      /* malloc(), free() */
 

diff --git a/src/extras/getopt.c b/src/extras/getopt.c
index 60b0b172a90c118d8d975bcb3cdb6bd493c3d74b..024caf045e8305ae7bab72ad36b52de79c4c34bd 100644 (file)
--- a/src/extras/getopt.c
+++ b/src/extras/getopt.c
@@ -30,6 +30,9 @@
 #define _NO_PROTO
 #endif
 
+/* Overkill. */
+#include <vlc/vlc.h>
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 10ea82a2c233eca768f1040d468b1d25f5b0a4e1..932def77d99e6b31b053c82922269ddd8df147c3 100644 (file)
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -5,7 +5,7 @@
  * thread, and destroy a previously oppened video output thread.
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: video_output.c,v 1.199 2002/11/20 01:49:15 gbazin Exp $
+ * $Id: video_output.c,v 1.200 2002/11/20 13:37:36 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *
@@ -63,8 +63,10 @@ static void     InitWindowSize    ( vout_thread_t *, int *, int * );
  * to its description. On error, it returns NULL.
  *****************************************************************************/
 vout_thread_t * __vout_CreateThread ( vlc_object_t *p_parent,
-                                      int i_width, int i_height,
-                                      vlc_fourcc_t i_chroma, int i_aspect )
+                                      unsigned int i_width,
+                                      unsigned int i_height,
+                                      vlc_fourcc_t i_chroma,
+                                      unsigned int i_aspect )
 {
     vout_thread_t * p_vout;                             /* thread descriptor */
     int             i_index;                                /* loop variable */

diff --git a/src/video_output/vout_pictures.c b/src/video_output/vout_pictures.c
index 7a999b344c3553c1fbcfbbac5d57310c31b2ded7..5b014e8de20f92fd4e22b85b4792eff54db7e6ed 100644 (file)
--- a/src/video_output/vout_pictures.c
+++ b/src/video_output/vout_pictures.c
@@ -2,7 +2,7 @@
  * vout_pictures.c : picture management functions
  *****************************************************************************
  * Copyright (C) 2000 VideoLAN
- * $Id: vout_pictures.c,v 1.31 2002/11/19 20:45:09 gbazin Exp $
+ * $Id: vout_pictures.c,v 1.32 2002/11/20 13:37:36 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -357,8 +357,10 @@ picture_t * vout_RenderPicture( vout_thread_t *p_vout, picture_t *p_pic,
  * This function will be accessed by plugins. It calculates the relative
  * position of the output window and the image window.
  *****************************************************************************/
-void vout_PlacePicture( vout_thread_t *p_vout, int i_width, int i_height,
-                        int *pi_x, int *pi_y, int *pi_width, int *pi_height )
+void vout_PlacePicture( vout_thread_t *p_vout,
+                        unsigned int i_width, unsigned int i_height,
+                        unsigned int *pi_x, unsigned int *pi_y,
+                        unsigned int *pi_width, unsigned int *pi_height )
 {
     if( (i_width <= 0) || (i_height <=0) )
     {

diff --git a/src/video_output/vout_subpictures.c b/src/video_output/vout_subpictures.c
index 0ec290cadb53f895216873f0e011718d82c17275..657e7cd0321495c561f88d702bb9df10833cf298 100644 (file)
--- a/src/video_output/vout_subpictures.c
+++ b/src/video_output/vout_subpictures.c
@@ -2,7 +2,7 @@
  * vout_subpictures.c : subpicture management functions
  *****************************************************************************
  * Copyright (C) 2000 VideoLAN
- * $Id: vout_subpictures.c,v 1.17 2002/11/10 18:04:24 sam Exp $
+ * $Id: vout_subpictures.c,v 1.18 2002/11/20 13:37:36 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *          Samuel Hocevar <sam@zoy.org>
@@ -57,7 +57,8 @@ void  vout_DisplaySubPicture( vout_thread_t *p_vout, subpicture_t *p_subpic )
 
     if( i_margin >= 0 )
     {
-        if( p_subpic->i_height + i_margin <= p_vout->output.i_height )
+        if( p_subpic->i_height + (unsigned int)i_margin
+                                                 <= p_vout->output.i_height )
         {
             p_subpic->i_y = p_vout->output.i_height
                              - i_margin - p_subpic->i_height;