diff options
-rw-r--r-- | pjmedia/build/pjmedia_videodev.vcproj | 344 | ||||
-rw-r--r-- | pjmedia/src/pjmedia-videodev/avi_dev.c | 12 |
2 files changed, 181 insertions, 175 deletions
diff --git a/pjmedia/build/pjmedia_videodev.vcproj b/pjmedia/build/pjmedia_videodev.vcproj index 54d14f20..ccec90e7 100644 --- a/pjmedia/build/pjmedia_videodev.vcproj +++ b/pjmedia/build/pjmedia_videodev.vcproj @@ -225,12 +225,12 @@ /> </Configuration> <Configuration - Name="Release|Win32" + Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)" ConfigurationType="4" - InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-release-defaults.vsprops" + InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" + CharacterSet="1" > <Tool Name="VCPreBuildEventTool" @@ -249,6 +249,7 @@ /> <Tool Name="VCCLCompilerTool" + ExecutionBucket="7" AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/crypto/include,../../third_party/srtp/include,../.." PreprocessorDefinitions="_LIB;" PrecompiledHeaderFile="" @@ -264,7 +265,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\pjmedia-videodev-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).lib" + OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib" /> <Tool Name="VCALinkTool" @@ -276,16 +277,24 @@ Name="VCBscMakeTool" /> <Tool - Name="VCFxCopTool" + Name="VCCodeSignTool" /> <Tool Name="VCPostBuildEventTool" /> + <DeploymentTool + ForceDirty="-1" + RemoteDirectory="" + RegisterOutput="0" + AdditionalFiles="" + /> + <DebuggerTool + /> </Configuration> <Configuration - Name="Release|Pocket PC 2003 (ARMV4)" + Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)" ConfigurationType="4" - InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops" + InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="1" @@ -323,7 +332,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib" + OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib" /> <Tool Name="VCALinkTool" @@ -350,9 +359,9 @@ /> </Configuration> <Configuration - Name="Release|Smartphone 2003 (ARMV4)" + Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" ConfigurationType="4" - InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops" + InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="1" @@ -390,7 +399,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib" + OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib" /> <Tool Name="VCALinkTool" @@ -417,12 +426,12 @@ /> </Configuration> <Configuration - Name="Debug-Static|Win32" + Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" ConfigurationType="4" - InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-common-defaults.vsprops" + InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" + CharacterSet="1" > <Tool Name="VCPreBuildEventTool" @@ -441,6 +450,7 @@ /> <Tool Name="VCCLCompilerTool" + ExecutionBucket="7" AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/crypto/include,../../third_party/srtp/include,../.." PreprocessorDefinitions="_LIB;" PrecompiledHeaderFile="" @@ -456,7 +466,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\pjmedia-videodev-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).lib" + OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib" /> <Tool Name="VCALinkTool" @@ -468,19 +478,27 @@ Name="VCBscMakeTool" /> <Tool - Name="VCFxCopTool" + Name="VCCodeSignTool" /> <Tool Name="VCPostBuildEventTool" /> + <DeploymentTool + ForceDirty="-1" + RemoteDirectory="" + RegisterOutput="0" + AdditionalFiles="" + /> + <DebuggerTool + /> </Configuration> <Configuration - Name="Debug-Static|Pocket PC 2003 (ARMV4)" + Name="Release|Win32" ConfigurationType="4" - InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops" + InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-release-defaults.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="1" + CharacterSet="2" > <Tool Name="VCPreBuildEventTool" @@ -499,7 +517,6 @@ /> <Tool Name="VCCLCompilerTool" - ExecutionBucket="7" AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/crypto/include,../../third_party/srtp/include,../.." PreprocessorDefinitions="_LIB;" PrecompiledHeaderFile="" @@ -515,7 +532,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib" + OutputFile="..\lib\pjmedia-videodev-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).lib" /> <Tool Name="VCALinkTool" @@ -527,24 +544,16 @@ Name="VCBscMakeTool" /> <Tool - Name="VCCodeSignTool" + Name="VCFxCopTool" /> <Tool Name="VCPostBuildEventTool" /> - <DeploymentTool - ForceDirty="-1" - RemoteDirectory="" - RegisterOutput="0" - AdditionalFiles="" - /> - <DebuggerTool - /> </Configuration> <Configuration - Name="Debug-Static|Smartphone 2003 (ARMV4)" + Name="Release|Pocket PC 2003 (ARMV4)" ConfigurationType="4" - InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops" + InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="1" @@ -582,7 +591,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib" + OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib" /> <Tool Name="VCALinkTool" @@ -609,12 +618,12 @@ /> </Configuration> <Configuration - Name="Release-Dynamic|Win32" + Name="Release|Smartphone 2003 (ARMV4)" ConfigurationType="4" - InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-release-defaults.vsprops" + InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" + CharacterSet="1" > <Tool Name="VCPreBuildEventTool" @@ -633,6 +642,7 @@ /> <Tool Name="VCCLCompilerTool" + ExecutionBucket="7" AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/crypto/include,../../third_party/srtp/include,../.." PreprocessorDefinitions="_LIB;" PrecompiledHeaderFile="" @@ -648,7 +658,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\pjmedia-videodev-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).lib" + OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib" /> <Tool Name="VCALinkTool" @@ -660,16 +670,24 @@ Name="VCBscMakeTool" /> <Tool - Name="VCFxCopTool" + Name="VCCodeSignTool" /> <Tool Name="VCPostBuildEventTool" /> + <DeploymentTool + ForceDirty="-1" + RemoteDirectory="" + RegisterOutput="0" + AdditionalFiles="" + /> + <DebuggerTool + /> </Configuration> <Configuration - Name="Release-Dynamic|Pocket PC 2003 (ARMV4)" + Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)" ConfigurationType="4" - InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops" + InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="1" @@ -707,7 +725,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib" + OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib" /> <Tool Name="VCALinkTool" @@ -734,9 +752,9 @@ /> </Configuration> <Configuration - Name="Release-Dynamic|Smartphone 2003 (ARMV4)" + Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)" ConfigurationType="4" - InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops" + InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="1" @@ -774,7 +792,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib" + OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib" /> <Tool Name="VCALinkTool" @@ -801,12 +819,12 @@ /> </Configuration> <Configuration - Name="Debug-Dynamic|Win32" + Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" ConfigurationType="4" - InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-common-defaults.vsprops" + InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" + CharacterSet="1" > <Tool Name="VCPreBuildEventTool" @@ -825,6 +843,7 @@ /> <Tool Name="VCCLCompilerTool" + ExecutionBucket="7" AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/crypto/include,../../third_party/srtp/include,../.." PreprocessorDefinitions="_LIB;" PrecompiledHeaderFile="" @@ -840,7 +859,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\pjmedia-videodev-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).lib" + OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib" /> <Tool Name="VCALinkTool" @@ -852,16 +871,24 @@ Name="VCBscMakeTool" /> <Tool - Name="VCFxCopTool" + Name="VCCodeSignTool" /> <Tool Name="VCPostBuildEventTool" /> + <DeploymentTool + ForceDirty="-1" + RemoteDirectory="" + RegisterOutput="0" + AdditionalFiles="" + /> + <DebuggerTool + /> </Configuration> <Configuration - Name="Debug-Dynamic|Pocket PC 2003 (ARMV4)" + Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" ConfigurationType="4" - InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops" + InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="1" @@ -899,7 +926,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib" + OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib" /> <Tool Name="VCALinkTool" @@ -926,12 +953,12 @@ /> </Configuration> <Configuration - Name="Debug-Dynamic|Smartphone 2003 (ARMV4)" + Name="Debug-Static|Win32" ConfigurationType="4" - InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops" + InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-common-defaults.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="1" + CharacterSet="2" > <Tool Name="VCPreBuildEventTool" @@ -950,7 +977,6 @@ /> <Tool Name="VCCLCompilerTool" - ExecutionBucket="7" AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/crypto/include,../../third_party/srtp/include,../.." PreprocessorDefinitions="_LIB;" PrecompiledHeaderFile="" @@ -966,7 +992,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib" + OutputFile="..\lib\pjmedia-videodev-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).lib" /> <Tool Name="VCALinkTool" @@ -978,27 +1004,19 @@ Name="VCBscMakeTool" /> <Tool - Name="VCCodeSignTool" + Name="VCFxCopTool" /> <Tool Name="VCPostBuildEventTool" /> - <DeploymentTool - ForceDirty="-1" - RemoteDirectory="" - RegisterOutput="0" - AdditionalFiles="" - /> - <DebuggerTool - /> </Configuration> <Configuration - Name="Release-Static|Win32" + Name="Debug-Static|Pocket PC 2003 (ARMV4)" ConfigurationType="4" - InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-release-defaults.vsprops" + InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="2" + CharacterSet="1" > <Tool Name="VCPreBuildEventTool" @@ -1017,6 +1035,7 @@ /> <Tool Name="VCCLCompilerTool" + ExecutionBucket="7" AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/crypto/include,../../third_party/srtp/include,../.." PreprocessorDefinitions="_LIB;" PrecompiledHeaderFile="" @@ -1032,7 +1051,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\pjmedia-videodev-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).lib" + OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib" /> <Tool Name="VCALinkTool" @@ -1044,16 +1063,24 @@ Name="VCBscMakeTool" /> <Tool - Name="VCFxCopTool" + Name="VCCodeSignTool" /> <Tool Name="VCPostBuildEventTool" /> + <DeploymentTool + ForceDirty="-1" + RemoteDirectory="" + RegisterOutput="0" + AdditionalFiles="" + /> + <DebuggerTool + /> </Configuration> <Configuration - Name="Release-Static|Pocket PC 2003 (ARMV4)" + Name="Debug-Static|Smartphone 2003 (ARMV4)" ConfigurationType="4" - InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops" + InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="1" @@ -1091,7 +1118,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib" + OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib" /> <Tool Name="VCALinkTool" @@ -1118,9 +1145,9 @@ /> </Configuration> <Configuration - Name="Release-Static|Smartphone 2003 (ARMV4)" + Name="Debug-Static|Windows Mobile 6 Standard SDK (ARMV4I)" ConfigurationType="4" - InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops" + InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="1" @@ -1158,7 +1185,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib" + OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib" /> <Tool Name="VCALinkTool" @@ -1185,7 +1212,7 @@ /> </Configuration> <Configuration - Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)" + Name="Debug-Static|Windows Mobile 6 Professional SDK (ARMV4I)" ConfigurationType="4" InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops" UseOfMFC="0" @@ -1225,7 +1252,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib" + OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib" /> <Tool Name="VCALinkTool" @@ -1252,9 +1279,9 @@ /> </Configuration> <Configuration - Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)" + Name="Debug-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" ConfigurationType="4" - InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops" + InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="1" @@ -1292,7 +1319,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib" + OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib" /> <Tool Name="VCALinkTool" @@ -1319,7 +1346,7 @@ /> </Configuration> <Configuration - Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" + Name="Debug-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" ConfigurationType="4" InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops" UseOfMFC="0" @@ -1359,7 +1386,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib" + OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib" /> <Tool Name="VCALinkTool" @@ -1386,12 +1413,12 @@ /> </Configuration> <Configuration - Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" + Name="Release-Dynamic|Win32" ConfigurationType="4" - InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops" + InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-release-defaults.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="1" + CharacterSet="2" > <Tool Name="VCPreBuildEventTool" @@ -1410,7 +1437,6 @@ /> <Tool Name="VCCLCompilerTool" - ExecutionBucket="7" AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/crypto/include,../../third_party/srtp/include,../.." PreprocessorDefinitions="_LIB;" PrecompiledHeaderFile="" @@ -1426,7 +1452,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib" + OutputFile="..\lib\pjmedia-videodev-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).lib" /> <Tool Name="VCALinkTool" @@ -1438,24 +1464,16 @@ Name="VCBscMakeTool" /> <Tool - Name="VCCodeSignTool" + Name="VCFxCopTool" /> <Tool Name="VCPostBuildEventTool" /> - <DeploymentTool - ForceDirty="-1" - RemoteDirectory="" - RegisterOutput="0" - AdditionalFiles="" - /> - <DebuggerTool - /> </Configuration> <Configuration - Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)" + Name="Release-Dynamic|Pocket PC 2003 (ARMV4)" ConfigurationType="4" - InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops" + InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="1" @@ -1493,7 +1511,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib" + OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib" /> <Tool Name="VCALinkTool" @@ -1520,9 +1538,9 @@ /> </Configuration> <Configuration - Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)" + Name="Release-Dynamic|Smartphone 2003 (ARMV4)" ConfigurationType="4" - InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops" + InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="1" @@ -1560,7 +1578,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib" + OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib" /> <Tool Name="VCALinkTool" @@ -1587,9 +1605,9 @@ /> </Configuration> <Configuration - Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" + Name="Release-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)" ConfigurationType="4" - InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops" + InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="1" @@ -1627,7 +1645,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib" + OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib" /> <Tool Name="VCALinkTool" @@ -1654,9 +1672,9 @@ /> </Configuration> <Configuration - Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" + Name="Release-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)" ConfigurationType="4" - InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops" + InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="1" @@ -1694,7 +1712,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib" + OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib" /> <Tool Name="VCALinkTool" @@ -1721,9 +1739,9 @@ /> </Configuration> <Configuration - Name="Debug-Static|Windows Mobile 6 Standard SDK (ARMV4I)" + Name="Release-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" ConfigurationType="4" - InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops" + InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="1" @@ -1761,7 +1779,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib" + OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib" /> <Tool Name="VCALinkTool" @@ -1788,9 +1806,9 @@ /> </Configuration> <Configuration - Name="Debug-Static|Windows Mobile 6 Professional SDK (ARMV4I)" + Name="Release-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" ConfigurationType="4" - InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops" + InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="1" @@ -1828,7 +1846,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib" + OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib" /> <Tool Name="VCALinkTool" @@ -1855,12 +1873,12 @@ /> </Configuration> <Configuration - Name="Debug-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" + Name="Debug-Dynamic|Win32" ConfigurationType="4" - InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops" + InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-common-defaults.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="1" + CharacterSet="2" > <Tool Name="VCPreBuildEventTool" @@ -1879,7 +1897,6 @@ /> <Tool Name="VCCLCompilerTool" - ExecutionBucket="7" AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/crypto/include,../../third_party/srtp/include,../.." PreprocessorDefinitions="_LIB;" PrecompiledHeaderFile="" @@ -1895,7 +1912,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib" + OutputFile="..\lib\pjmedia-videodev-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).lib" /> <Tool Name="VCALinkTool" @@ -1907,24 +1924,16 @@ Name="VCBscMakeTool" /> <Tool - Name="VCCodeSignTool" + Name="VCFxCopTool" /> <Tool Name="VCPostBuildEventTool" /> - <DeploymentTool - ForceDirty="-1" - RemoteDirectory="" - RegisterOutput="0" - AdditionalFiles="" - /> - <DebuggerTool - /> </Configuration> <Configuration - Name="Debug-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" + Name="Debug-Dynamic|Pocket PC 2003 (ARMV4)" ConfigurationType="4" - InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops" + InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="1" @@ -1962,7 +1971,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib" + OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib" /> <Tool Name="VCALinkTool" @@ -1989,9 +1998,9 @@ /> </Configuration> <Configuration - Name="Release-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)" + Name="Debug-Dynamic|Smartphone 2003 (ARMV4)" ConfigurationType="4" - InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops" + InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="1" @@ -2029,7 +2038,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib" + OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib" /> <Tool Name="VCALinkTool" @@ -2056,9 +2065,9 @@ /> </Configuration> <Configuration - Name="Release-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)" + Name="Debug-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)" ConfigurationType="4" - InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops" + InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="1" @@ -2096,7 +2105,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib" + OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib" /> <Tool Name="VCALinkTool" @@ -2123,9 +2132,9 @@ /> </Configuration> <Configuration - Name="Release-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" + Name="Debug-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)" ConfigurationType="4" - InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops" + InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="1" @@ -2163,7 +2172,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib" + OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib" /> <Tool Name="VCALinkTool" @@ -2190,9 +2199,9 @@ /> </Configuration> <Configuration - Name="Release-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" + Name="Debug-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" ConfigurationType="4" - InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops" + InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="1" @@ -2230,7 +2239,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib" + OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib" /> <Tool Name="VCALinkTool" @@ -2257,9 +2266,9 @@ /> </Configuration> <Configuration - Name="Debug-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)" + Name="Debug-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" ConfigurationType="4" - InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops" + InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="1" @@ -2297,7 +2306,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).lib" + OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib" /> <Tool Name="VCALinkTool" @@ -2324,12 +2333,12 @@ /> </Configuration> <Configuration - Name="Debug-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)" + Name="Release-Static|Win32" ConfigurationType="4" - InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops" + InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-release-defaults.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" - CharacterSet="1" + CharacterSet="2" > <Tool Name="VCPreBuildEventTool" @@ -2348,7 +2357,6 @@ /> <Tool Name="VCCLCompilerTool" - ExecutionBucket="7" AdditionalIncludeDirectories="../include,../../pjlib/include,../../pjlib-util/include,../../pjnath/include,../../third_party/portaudio/include,../../third_party/speex/include,../../third_party/build/srtp,../../third_party/srtp/crypto/include,../../third_party/srtp/include,../.." PreprocessorDefinitions="_LIB;" PrecompiledHeaderFile="" @@ -2364,7 +2372,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).lib" + OutputFile="..\lib\pjmedia-videodev-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).lib" /> <Tool Name="VCALinkTool" @@ -2376,24 +2384,16 @@ Name="VCBscMakeTool" /> <Tool - Name="VCCodeSignTool" + Name="VCFxCopTool" /> <Tool Name="VCPostBuildEventTool" /> - <DeploymentTool - ForceDirty="-1" - RemoteDirectory="" - RegisterOutput="0" - AdditionalFiles="" - /> - <DebuggerTool - /> </Configuration> <Configuration - Name="Debug-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)" + Name="Release-Static|Pocket PC 2003 (ARMV4)" ConfigurationType="4" - InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops" + InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="1" @@ -2431,7 +2431,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).lib" + OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).lib" /> <Tool Name="VCALinkTool" @@ -2458,9 +2458,9 @@ /> </Configuration> <Configuration - Name="Debug-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)" + Name="Release-Static|Smartphone 2003 (ARMV4)" ConfigurationType="4" - InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops" + InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="1" @@ -2498,7 +2498,7 @@ /> <Tool Name="VCLibrarianTool" - OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).lib" + OutputFile="..\lib\pjmedia-audiodev-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).lib" /> <Tool Name="VCALinkTool" @@ -2801,6 +2801,10 @@ Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" > <File + RelativePath="..\src\pjmedia-videodev\avi_dev.c" + > + </File> + <File RelativePath="..\src\pjmedia-videodev\colorbar_dev.c" > </File> @@ -2834,6 +2838,10 @@ Filter="h;hpp;hxx;hm;inl" > <File + RelativePath="..\include\pjmedia-videodev\avi_dev.h" + > + </File> + <File RelativePath="..\include\pjmedia-videodev\config.h" > </File> diff --git a/pjmedia/src/pjmedia-videodev/avi_dev.c b/pjmedia/src/pjmedia-videodev/avi_dev.c index c34f5886..770f4f25 100644 --- a/pjmedia/src/pjmedia-videodev/avi_dev.c +++ b/pjmedia/src/pjmedia-videodev/avi_dev.c @@ -284,7 +284,7 @@ static void reset_dev_info(struct avi_dev_info *adi) PJ_DEF(pj_status_t) pjmedia_avi_dev_free(pjmedia_vid_dev_index id) { pjmedia_vid_dev_factory *f; - struct avi_factory *cf = (struct avi_factory*)f; + struct avi_factory *cf; unsigned local_idx; struct avi_dev_info *adi; pj_status_t status; @@ -465,7 +465,6 @@ static pj_status_t avi_factory_create_stream( pj_pool_t *pool = NULL; struct avi_dev_info *adi; struct avi_dev_strm *strm; - pj_status_t status; PJ_ASSERT_RETURN(f && param && p_vid_strm, PJ_EINVAL); PJ_ASSERT_RETURN(param->fmt.type == PJMEDIA_TYPE_VIDEO && @@ -500,11 +499,6 @@ static pj_status_t avi_factory_create_stream( *p_vid_strm = &strm->base; return PJ_SUCCESS; - -on_error: - if (pool) - pj_pool_release(pool); - return status; } /* API: Get stream info. */ @@ -528,6 +522,8 @@ static pj_status_t avi_dev_strm_get_cap(pjmedia_vid_dev_stream *s, struct avi_dev_strm *strm = (struct avi_dev_strm*)s; PJ_UNUSED_ARG(strm); + PJ_UNUSED_ARG(cap); + PJ_UNUSED_ARG(pval); PJ_ASSERT_RETURN(s && pval, PJ_EINVAL); @@ -542,6 +538,8 @@ static pj_status_t avi_dev_strm_set_cap(pjmedia_vid_dev_stream *s, struct avi_dev_strm *strm = (struct avi_dev_strm*)s; PJ_UNUSED_ARG(strm); + PJ_UNUSED_ARG(cap); + PJ_UNUSED_ARG(pval); PJ_ASSERT_RETURN(s && pval, PJ_EINVAL); |