[xiph-commits] r17293 - in trunk/oggdsf: . build/NSIS/Release sln/oggdsf_vs2005 sln/oggdsf_vs2008 src/lib/codecs/webm/libvpx/build src/lib/codecs/webm/webmdshow/libmkvparser src/lib/codecs/webm/webmdshow/vp8decoder src/lib/codecs/webm/webmdshow/vp8encoder src/lib/codecs/webm/webmdshow/webmmux src/lib/codecs/webm/webmdshow/webmsplit src/tests/testVideoImageGrab src/tools/DNPlay src/tools/iOCE

cristianadam at svn.xiph.org cristianadam at svn.xiph.org
Wed Jun 16 15:32:53 PDT 2010


Author: cristianadam
Date: 2010-06-16 15:32:53 -0700 (Wed, 16 Jun 2010)
New Revision: 17293

Added:
   trunk/oggdsf/sln/oggdsf_vs2008/update_from_vs2005.cmd
Removed:
   trunk/oggdsf/scripts/
   trunk/oggdsf/src/tests/testVideoImageGrab/testVideoImageGrab.csproj.user
   trunk/oggdsf/src/tools/DNPlay/DNPlay.csproj.user
   trunk/oggdsf/src/tools/iOCE/iOCE.csproj.user
Modified:
   trunk/oggdsf/ChangeLog.txt
   trunk/oggdsf/build/NSIS/Release/build.cmd
   trunk/oggdsf/build/NSIS/Release/macros.nsi
   trunk/oggdsf/build/NSIS/Release/opencodecs.nsi
   trunk/oggdsf/sln/oggdsf_vs2005/oggdsf.sln
   trunk/oggdsf/sln/oggdsf_vs2008/oggdsf.sln
   trunk/oggdsf/src/lib/codecs/webm/libvpx/build/vpx.vcproj
   trunk/oggdsf/src/lib/codecs/webm/webmdshow/libmkvparser/libmkvparser_2005.vcproj
   trunk/oggdsf/src/lib/codecs/webm/webmdshow/libmkvparser/libmkvparser_2008.vcproj
   trunk/oggdsf/src/lib/codecs/webm/webmdshow/vp8decoder/vp8decoder_2005.vcproj
   trunk/oggdsf/src/lib/codecs/webm/webmdshow/vp8decoder/vp8decoder_2008.vcproj
   trunk/oggdsf/src/lib/codecs/webm/webmdshow/vp8encoder/vp8encoder_2005.vcproj
   trunk/oggdsf/src/lib/codecs/webm/webmdshow/vp8encoder/vp8encoder_2008.vcproj
   trunk/oggdsf/src/lib/codecs/webm/webmdshow/webmmux/webmmux_2005.vcproj
   trunk/oggdsf/src/lib/codecs/webm/webmdshow/webmmux/webmmux_2008.vcproj
   trunk/oggdsf/src/lib/codecs/webm/webmdshow/webmsplit/webmsplit_2005.vcproj
   trunk/oggdsf/src/lib/codecs/webm/webmdshow/webmsplit/webmsplit_2008.vcproj
Log:
Added WebM support to installer script. 
Removed Annodex support from installer script (there was only an Annodex muxer and CMML parser, no Annodex demuxer). It might be added back in a future version.
Removed unneeded registry scripts.

Modified: trunk/oggdsf/ChangeLog.txt
===================================================================
--- trunk/oggdsf/ChangeLog.txt	2010-06-16 13:32:35 UTC (rev 17292)
+++ trunk/oggdsf/ChangeLog.txt	2010-06-16 22:32:53 UTC (rev 17293)
@@ -1,3 +1,11 @@
+Version 0.84.xxxxx - xx.06.2010
+    
+    * Added WebM support (libvpx 0.9.0, webmdshow 0.9.8.0)
+    * Installer updates: 
+        - merged Win32 and x64 installers into one installer
+        - added support for WebM
+        - dropped support for Annodex Muxer, CMML decoder filters     
+    
 Version 0.83.17220 - 16.05.2010
 
     * Updated libvorbis to version 1.3.1

Modified: trunk/oggdsf/build/NSIS/Release/build.cmd
===================================================================
--- trunk/oggdsf/build/NSIS/Release/build.cmd	2010-06-16 13:32:35 UTC (rev 17292)
+++ trunk/oggdsf/build/NSIS/Release/build.cmd	2010-06-16 22:32:53 UTC (rev 17293)
@@ -10,15 +10,16 @@
 set SVN_REVISION=%SVN_REVISION_FULL:~-5%
 del revision_text
 
-set PRODUCT_VERSION=0.83.%SVN_REVISION%
+set PRODUCT_VERSION=0.84.%SVN_REVISION%
 set OPENCODECS_ROOT_DIR=..\..\..
 
 @set FILTERS=dsfFLACEncoder dsfNativeFLACSource dsfFLACDecoder
 @set FILTERS=%FILTERS% dsfTheoraEncoder dsfTheoraDecoder
 @set FILTERS=%FILTERS% dsfSpeexEncoder dsfSpeexDecoder
 @set FILTERS=%FILTERS% dsfVorbisEncoder dsfVorbisDecoder
- at set FILTERS=%FILTERS% dsfCMMLDecoder dsfCMMLRawSource
- at set FILTERS=%FILTERS% dsfOggMux dsfAnxMux dsfOggDemux2
+ at set FILTERS=%FILTERS% dsfOggMux dsfOggDemux2
+ at set FILTERS=%FILTERS% vp8decoder vp8encoder
+ at set FILTERS=%FILTERS% webmmux webmsplit
 @set FILTERS=%FILTERS% wmpinfo AxPlayer
 
 call:copy_binaries

Modified: trunk/oggdsf/build/NSIS/Release/macros.nsi
===================================================================
--- trunk/oggdsf/build/NSIS/Release/macros.nsi	2010-06-16 13:32:35 UTC (rev 17292)
+++ trunk/oggdsf/build/NSIS/Release/macros.nsi	2010-06-16 22:32:53 UTC (rev 17293)
@@ -78,7 +78,7 @@
 ; Windows Media Player type registraton macro
 ;--------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
-!macro RegisterWmpType_Internal typeName description WmpLocation
+!macro RegisterWmpType_Internal typeName description WmpLocation IcoFile
 
     WriteRegStr HKCR "${typeName}" "" "${description}"
     WriteRegStr HKCR "${typeName}\shell" "" "play"
@@ -95,15 +95,15 @@
         WriteRegStr HKCR "${typeName}\shellex\ContextMenuHandlers\WMPPlayAsPlaylist" "" "{CE3FB1D1-02AE-4a5f-A6E9-D9F1B4073E6C}"
     ${EndIf}
 
-    WriteRegStr HKCR "${typeName}\DefaultIcon" "" "$INSTDIR\xifish.ico"
+    WriteRegStr HKCR "${typeName}\DefaultIcon" "" "$INSTDIR\${IcoFile}"
 !macroend
 
-!macro RegisterWmpType typeName description
+!macro RegisterWmpType typeName description IcoFile
     SetRegView 32
-    !insertmacro RegisterWmpType_Internal "${typeName}" "${description}" "$WMP_LOCATION_WIN32"
+    !insertmacro RegisterWmpType_Internal "${typeName}" "${description}" "$WMP_LOCATION_WIN32" "${IcoFile}"
     ${If} ${RunningX64}
         SetRegView 64
-        !insertmacro RegisterWmpType_Internal "${typeName}" "${description}" "$WMP_LOCATION_X64"
+        !insertmacro RegisterWmpType_Internal "${typeName}" "${description}" "$WMP_LOCATION_X64" "${IcoFile}"
     ${EndIf}
 !macroend
 !define RegisterWmpType "!insertmacro RegisterWmpType"
@@ -149,9 +149,9 @@
 
 ;--------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
-!macro AddWmpExtension_Internal TypeExt TypeDesc MimeType PerceivedType ExtensionHandler
+!macro AddWmpExtension_Internal TypeExt TypeDesc MimeType PerceivedType ExtensionHandler IcoFile
     WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\${TypeExt}" "MediaType.Description" "${TypeDesc}"
-    WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\${TypeExt}" "MediaType.Icon" "$INSTDIR\xifish.ico"
+    WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\${TypeExt}" "MediaType.Icon" "$INSTDIR\${IcoFile}"
     WriteRegDWORD HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\${TypeExt}" "Permissions" 0x0000000f
     WriteRegDWORD HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\Extensions\${TypeExt}" "Runtime" 0x00000007
     ${If} "${PerceivedType}" != ""  
@@ -163,12 +163,12 @@
     ${EndIf}
 !macroend 
 
-!macro AddWmpExtension TypeExt TypeDesc MimeType PerceivedType ExtensionHandler
+!macro AddWmpExtension TypeExt TypeDesc MimeType PerceivedType ExtensionHandler IcoFile
     SetRegView 32
-    !insertmacro AddWmpExtension_Internal "${TypeExt}" "${TypeDesc}" "${MimeType}" "${PerceivedType}" "${ExtensionHandler}"
+    !insertmacro AddWmpExtension_Internal "${TypeExt}" "${TypeDesc}" "${MimeType}" "${PerceivedType}" "${ExtensionHandler}" "${IcoFile}"
     ${If} ${RunningX64}
         SetRegView 64
-        !insertmacro AddWmpExtension_Internal "${TypeExt}" "${TypeDesc}" "${MimeType}" "${PerceivedType}" "${ExtensionHandler}"
+        !insertmacro AddWmpExtension_Internal "${TypeExt}" "${TypeDesc}" "${MimeType}" "${PerceivedType}" "${ExtensionHandler}" "${IcoFile}"
     ${EndIf}
 !macroend
 !define AddWmpExtension "!insertmacro AddWmpExtension"
@@ -327,6 +327,33 @@
 
 ;--------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
+!macro AddWebmRecognitionPattern_Internal
+  WriteRegStr HKCR "Media Type\{E436EB83-524F-11CE-9F53-0020AF0BA770}\{ED3110F8-5211-11DF-94AF-0026B977EEAA}" "0" "0,4,,1A45DFA3"
+  WriteRegStr HKCR "Media Type\{E436EB83-524F-11CE-9F53-0020AF0BA770}\{ED3110F8-5211-11DF-94AF-0026B977EEAA}" "Source Filter" "{E436EBB5-524F-11CE-9F53-0020AF0BA770}";
+!macroend
+
+!macro AddWebmRecognitionPattern
+    SetRegView 32
+    !insertmacro AddWebmRecognitionPattern_Internal
+    ${If} ${RunningX64}
+        SetRegView 64
+        !insertmacro AddWebmRecognitionPattern_Internal
+    ${EndIf}
+!macroend
+!define AddWebmRecognitionPattern "!insertmacro AddWebmRecognitionPattern"
+
+!macro DeleteWebmRecognitionPattern
+    SetRegView 32
+    DeleteRegKey HKCR "Media Type\{E436EB83-524F-11CE-9F53-0020AF0BA770}\{ED3110F8-5211-11DF-94AF-0026B977EEAA}"
+    ${If} ${RunningX64}
+        SetRegView 64
+        DeleteRegKey HKCR "Media Type\{E436EB83-524F-11CE-9F53-0020AF0BA770}\{ED3110F8-5211-11DF-94AF-0026B977EEAA}"
+    ${EndIf}
+!macroend
+!define DeleteWebmRecognitionPattern "!insertmacro DeleteWebmRecognitionPattern"
+
+;--------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
 !macro AddWmpMimeType_Internal MimeType TypeDesc TypeExt TypeExtComma TypeExtSpace
     WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\MIME Types\${MimeType}" "" "${TypeDesc}"
     WriteRegStr HKLM "SOFTWARE\Microsoft\Multimedia\WMPlayer\MIME Types\${MimeType}" "Extension.Key" "${TypeExt}"

Modified: trunk/oggdsf/build/NSIS/Release/opencodecs.nsi
===================================================================
--- trunk/oggdsf/build/NSIS/Release/opencodecs.nsi	2010-06-16 13:32:35 UTC (rev 17292)
+++ trunk/oggdsf/build/NSIS/Release/opencodecs.nsi	2010-06-16 22:32:53 UTC (rev 17293)
@@ -187,8 +187,9 @@
     ; Runtime libraries from visual studio
     ${AddVisualStudioRuntime}
   
-    ; ico files - 1 (One file contains all these packed)
+    ; Icon files - 2
     File "${OPENCODECS_ROOT_DIR}\bin\xifish.ico"
+    File "${OPENCODECS_ROOT_DIR}\bin\webm.ico"
 
     ; Text files - 7
     File "${OPENCODECS_ROOT_DIR}\README"
@@ -204,22 +205,20 @@
     ${AddFile} "dsfSpeexEncoder.dll"
     ${AddFile} "dsfTheoraEncoder.dll"
     ${AddFile} "dsfVorbisEncoder.dll"
-
+    ${AddFile} "vp8encoder.dll"
+  
     ${AddFile} "dsfNativeFLACSource.dll"
     ${AddFile} "dsfSpeexDecoder.dll"
     ${AddFile} "dsfTheoraDecoder.dll"
     ${AddFile} "dsfFLACDecoder.dll"
     ${AddFile} "dsfVorbisDecoder.dll"
+    ${AddFile} "vp8decoder.dll"
 
     ${AddFile} "dsfOggDemux2.dll"
     ${AddFile} "dsfOggMux.dll"
+    ${AddFile} "webmsplit.dll"
+    ${AddFile} "webmmux.dll"
 
-    ${AddFile} "dsfCMMLDecoder.dll"
-    ${AddFile} "dsfCMMLRawSource.dll"
-
-    ; ${AddFile} "dsfAnxDemux.dll"
-    ${AddFile} "dsfAnxMux.dll"                                           
-
     ${AddFile} "wmpinfo.dll"
 
     ; HTML <video> Tag Implementation
@@ -230,117 +229,97 @@
     SetDetailsPrint listonly
 
     SetOutPath "$INSTDIR"
-    ; Register libraries - 15
 
+    ; Register libraries 
     ${RegisterCOM} "dsfFLACEncoder.dll"
     ${RegisterCOM} "dsfSpeexEncoder.dll" 
     ${RegisterCOM} "dsfTheoraEncoder.dll"
     ${RegisterCOM} "dsfVorbisEncoder.dll" 
+    ${RegisterCOM} "vp8encoder.dll"
   
     ${RegisterCOM} "dsfNativeFLACSource.dll" 
     ${RegisterCOM} "dsfSpeexDecoder.dll" 
     ${RegisterCOM} "dsfTheoraDecoder.dll" 
     ${RegisterCOM} "dsfFLACDecoder.dll" 
     ${RegisterCOM} "dsfVorbisDecoder.dll" 
+    ${RegisterCOM} "vp8decoder.dll"
     
     ${RegisterCOM} "dsfOggDemux2.dll" 
     ${RegisterCOM} "dsfOggMux.dll" 
-  
-    ${RegisterCOM} "dsfCMMLDecoder.dll" 
-    ${RegisterCOM} "dsfCMMLRawSource.dll" 
-  
-    ;${RegisterCOM} "dsfAnxDemux.dll" 
-    ${RegisterCOM} "dsfAnxMux.dll"
-  
+    ${RegisterCOM} "webmsplit.dll"
+    ${RegisterCOM} "webmmux.dll"
+   
     SetDetailsPrint textonly
     DetailPrint "Writing Registry Entries ..."
     SetDetailsPrint listonly
 
-    ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-    ; Registry Entries for directshow and WMP
-    ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-    ;;;	*	Media Group Entries for WMP
-    ;;;			-	flac (audio)
-    ;;;			-	oga
-    ;;;			-	ogv
-    ;;;			-	axa
-    ;;;			-	axv
-    ;;;			-	spx
-    ;;;			-	ogg(TODO::: Check if can have no group)
-    ;;;	*	Mime Type Entries for WMP
-    ;;;	*	Extension Entries for WMP - TODO::: Other entries, icons
-    ;;;	*	Media Type Entries/Filter association for Directshow
-    ;;;	*	MLS(?) Entries for WMP
-
     ; Media Group Entries - 7
     ${AddWmpMediaGroup} ".flac" "FLAC" "FLAC File (flac)" "audio/flac" "Audio"
     ${AddWmpMediaGroup} ".oga" "OGA" "Ogg Audio File (oga)" "audio/ogg" "Audio"
     ${AddWmpMediaGroup} ".ogg" "OGG" "Ogg Audio File (ogg)" "audio/ogg" "Audio"
-    ${AddWmpMediaGroup} ".axa" "AXA" "Annodex Audio File (axa)" "audio/annodex" "Audio"
-    ${AddWmpMediaGroup} ".spx" "SPX" "Speex File (spx)" "audio/ogg" "Audio"
-    ${AddWmpMediaGroup} ".axv" "AXV" "Annodex Video File (axv)" "video/annodex" "Video"
     ${AddWmpMediaGroup} ".ogv" "OGV" "Ogg Video File (ogv)" "video/ogg" "Video"
+    ${AddWmpMediaGroup} ".spx" "SPX" "Speex File (spx)" "audio/ogg" "Audio"
+    ${AddWmpMediaGroup} ".weba" "WEBA" "WebM Audio File (weba)" "audio/webm" "Audio"
+    ${AddWmpMediaGroup} ".webm" "WEBM" "WebM Video File (webm)" "video/webm" "Video"
 
-    ; WMP Mime type entries - 7
-    ${AddWmpMimeType} "application/annodex" "Annodex File" ".anx" "anx,axa,axv" ".anx .axa .axv"
+    ; WMP Mime type entries - 6
     ${AddWmpMimeType} "application/ogg" "Ogg File" ".ogg" "ogg,oga,ogv,spx" ".ogg .oga .ogv .spx"
     ${AddWmpMimeType} "audio/flac" "FLAC Audio File" ".flac" "flac" ".flac"
     ${AddWmpMimeType} "audio/ogg" "Ogg Audio File" ".oga" "ogg,oga,spx" ".ogg .oga .spx"
     ${AddWmpMimeType} "video/ogg" "Ogg Video File" ".ogv" "ogv" ".ogv"
-    ${AddWmpMimeType} "audio/annodex" "Annodex Audio File" ".axa" "axa" ".axa"
-    ${AddWmpMimeType} "video/annodex" "Annodex Video File" ".axv" "axv" ".axv"
+    ${AddWmpMimeType} "audio/webm" "WebM Audio File" ".weba" "weba" ".weba"
+    ${AddWmpMimeType} "video/webm" "WebM Video File" ".webm" "webm" ".webm"
 
-    ; WMP extension entries - 8
-    ${AddWmpExtension} ".anx" "Annodex" "application/annodex" "" ""
-    ${AddWmpExtension} ".axa" "Annodex Audio" "audio/annodex" "audio" ""
-    ${AddWmpExtension} ".axv" "Annodex Video" "video/annodex" "video" ""
-    ${AddWmpExtension} ".flac" "FLAC Audio" "audio/flac" "audio" "WMP.FlacFile"
-    ${AddWmpExtension} ".oga" "Ogg Audio" "audio/ogg" "audio" "WMP.OgaFile"
-    ${AddWmpExtension} ".ogg" "Ogg Audio" "audio/ogg" "audio" "WMP.OggFile"
-    ${AddWmpExtension} ".ogv" "Ogg Video" "video/ogg" "video" "WMP.OgvFile"
-    ${AddWmpExtension} ".spx" "Speex Audio" "audio/ogg" "audio" "WMP.SpxFile"
+    ; WMP extension entries - 7
+    ${AddWmpExtension} ".flac" "FLAC Audio" "audio/flac" "audio" "WMP.FlacFile" "xifish.ico"
+    ${AddWmpExtension} ".oga" "Ogg Audio" "audio/ogg" "audio" "WMP.OgaFile" "xifish.ico"
+    ${AddWmpExtension} ".ogg" "Ogg Audio" "audio/ogg" "audio" "WMP.OggFile" "xifish.ico"
+    ${AddWmpExtension} ".ogv" "Ogg Video" "video/ogg" "video" "WMP.OgvFile" "xifish.ico"
+    ${AddWmpExtension} ".spx" "Speex Audio" "audio/ogg" "audio" "WMP.SpxFile" "xifish.ico"
+    ${AddWmpExtension} ".weba" "WebM Audio" "audio/webm" "audio" "WMP.WebaFile" "webm.ico"
+    ${AddWmpExtension} ".webm" "WebM Video" "video/webm" "video" "WMP.WebmFile" "webm.ico"
 
-    ; MIME type entries - 7
-    ${AddMimeType} "application/annodex" ".anx"
+    ; MIME type entries  - 6
     ${AddMimeType} "application/ogg" ".ogx"
-    ${AddMimeType} "audio/annodex" ".axa" 
-    ${AddMimeType} "video/annodex" ".axv" 
     ${AddMimeType} "audio/flac" ".flac"
     ${AddMimeType} "audio/ogg" ".ogg"
     ${AddMimeType} "video/ogg" ".ogv"
+    ${AddMimeType} "audio/webm" ".weba"
+    ${AddMimeType} "video/webm" ".webm"
 
-    ; Directshow extension to filter mapping - 8
+    ; Directshow extension to filter mapping - 7
     ; Mapped to File Source (Async.), except for FLAC
-    ${AddMediaTypeExtensionSource} ".anx" "{E436EBB5-524F-11CE-9F53-0020AF0BA770}"
-    ${AddMediaTypeExtensionSource} ".axa" "{E436EBB5-524F-11CE-9F53-0020AF0BA770}"
-    ${AddMediaTypeExtensionSource} ".axv" "{E436EBB5-524F-11CE-9F53-0020AF0BA770}"
     ${AddMediaTypeExtensionSource} ".flac" "{6DDA37BA-0553-499a-AE0D-BEBA67204548}"
     ${AddMediaTypeExtensionSource} ".oga" "{E436EBB5-524F-11CE-9F53-0020AF0BA770}"
     ${AddMediaTypeExtensionSource} ".ogg" "{E436EBB5-524F-11CE-9F53-0020AF0BA770}"
     ${AddMediaTypeExtensionSource} ".ogv" "{E436EBB5-524F-11CE-9F53-0020AF0BA770}"
     ${AddMediaTypeExtensionSource} ".spx" "{E436EBB5-524F-11CE-9F53-0020AF0BA770}"
+    ${AddMediaTypeExtensionSource} ".weba" "{E436EBB5-524F-11CE-9F53-0020AF0BA770}"
+    ${AddMediaTypeExtensionSource} ".webm" "{E436EBB5-524F-11CE-9F53-0020AF0BA770}"
 
-    ; Directshow extension to filter mapping for HTTP - 7
+    ; Directshow extension to filter mapping for HTTP  - 6
     ; Mapped to File Source (URL)
+    ${AddHttpExtensionSource} ".OGA" "{E436EBB6-524F-11CE-9F53-0020AF0BA770}"
     ${AddHttpExtensionSource} ".OGG" "{E436EBB6-524F-11CE-9F53-0020AF0BA770}"
     ${AddHttpExtensionSource} ".OGV" "{E436EBB6-524F-11CE-9F53-0020AF0BA770}"
-    ${AddHttpExtensionSource} ".OGA" "{E436EBB6-524F-11CE-9F53-0020AF0BA770}"
     ${AddHttpExtensionSource} ".SPX" "{E436EBB6-524F-11CE-9F53-0020AF0BA770}"
-    ${AddHttpExtensionSource} ".ANX" "{E436EBB6-524F-11CE-9F53-0020AF0BA770}"
-    ${AddHttpExtensionSource} ".AXV" "{E436EBB6-524F-11CE-9F53-0020AF0BA770}"
-    ${AddHttpExtensionSource} ".AXA" "{E436EBB6-524F-11CE-9F53-0020AF0BA770}"
+    ${AddHttpExtensionSource} ".WEBA" "{E436EBB6-524F-11CE-9F53-0020AF0BA770}"
+    ${AddHttpExtensionSource} ".WEBM" "{E436EBB6-524F-11CE-9F53-0020AF0BA770}"
       
     ; Add the "OggS" recognition pattern
     ${AddOggRecognitionPattern}
+    
+    ; Add "EBML" recognition pattern
+    ${AddWebmRecognitionPattern}
 
     ; MLS Perceived type - 7
-    ${AddMediaPlayerMlsExtension} "ogv" "video"
-    ${AddMediaPlayerMlsExtension} "oga" "audio"
-    ${AddMediaPlayerMlsExtension} "axv" "video"
-    ${AddMediaPlayerMlsExtension} "axa" "audio"
-    ${AddMediaPlayerMlsExtension} "spx" "audio"
     ${AddMediaPlayerMlsExtension} "flac" "audio"  
+    ${AddMediaPlayerMlsExtension} "oga" "audio"
     ${AddMediaPlayerMlsExtension} "ogg" "audio"  
+    ${AddMediaPlayerMlsExtension} "ogv" "video"
+    ${AddMediaPlayerMlsExtension} "spx" "audio"
+    ${AddMediaPlayerMlsExtension} "weba" "audio"
+    ${AddMediaPlayerMlsExtension} "webm" "audio"  
       
     ; Remove the previously set Media Player description
     ${RemoveMediaPlayerDesc} "SOFTWARE\illiminable\oggcodecs"
@@ -363,33 +342,45 @@
 ${MementoSection} ".ogg"  SecOgg
     SectionIn 1
     ${RegisterExtension} ".ogg" "WMP.OggFile" "audio/ogg" "audio"
-    ${RegisterWmpType} "WMP.OggFile" "Ogg File"
+    ${RegisterWmpType} "WMP.OggFile" "Ogg File" "xifish.ico"
 ${MementoSectionEnd}
 
 ${MementoSection} ".oga" SecOga
     SectionIn 1
     ${RegisterExtension} ".oga" "WMP.OgaFile" "audio/ogg" "audio"
-    ${RegisterWmpType} "WMP.OgaFile" "Ogg Audio File"
+    ${RegisterWmpType} "WMP.OgaFile" "Ogg Audio File" "xifish.ico"
 ${MementoSectionEnd}
 
 ${MementoSection} ".ogv"  SecOgv
     SectionIn 1
     ${RegisterExtension} ".ogv" "WMP.OgvFile" "video/ogg" "video"
-    ${RegisterWmpType} "WMP.OgvFile" "Ogg Video File"
+    ${RegisterWmpType} "WMP.OgvFile" "Ogg Video File" "xifish.ico"
 ${MementoSectionEnd}
 
 ${MementoSection} ".spx"  SecSpx
     SectionIn 1
     ${RegisterExtension} ".spx" "WMP.SpxFile" "audio/ogg" "audio"
-    ${RegisterWmpType} "WMP.SpxFile" "Speex File"
+    ${RegisterWmpType} "WMP.SpxFile" "Speex File" "xifish.ico"
 ${MementoSectionEnd}
 
 ${MementoSection} ".flac" SecFlac
     SectionIn 1
     ${RegisterExtension} ".flac" "WMP.FlacFile" "audio/flac" "audio"
-    ${RegisterWmpType} "WMP.FlacFile" "FLAC File"
+    ${RegisterWmpType} "WMP.FlacFile" "FLAC File" "xifish.ico"
 ${MementoSectionEnd}
 
+${MementoSection} ".weba" SecWeba
+    SectionIn 1
+    ${RegisterExtension} ".weba" "WMP.WebaFile" "audio/webm" "audio"
+    ${RegisterWmpType} "WMP.WebaFile" "WebM Audio File" "webm.ico"
+${MementoSectionEnd}
+
+${MementoSection} ".webm" SecWebm
+    SectionIn 1
+    ${RegisterExtension} ".webm" "WMP.WebmFile" "video/webm" "video"
+    ${RegisterWmpType} "WMP.WebmFile" "WebM Video File" "webm.ico"
+${MementoSectionEnd}
+
 SectionGroupEnd
 
 ;--------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -499,120 +490,117 @@
     SetDetailsPrint listonly
   
     ; Unregister libraries - 15
-    ; Unregister core annodex libraries
-    ${UnRegisterCOM} "dsfCMMLDecoder.dll"
-    ${UnRegisterCOM} "dsfCMMLRawSource.dll"
-  
-    ; ${UnRegisterCOM} "dsfAnxDemux.dll"'
-    ${UnRegisterCOM} "dsfAnxMux.dll"
-  
-    ; Unregister core ogg libraries
     ${UnRegisterCOM} "dsfOggDemux2.dll"
     ${UnRegisterCOM} "dsfOggMux.dll"
+    ${UnRegisterCOM} "webmsplit.dll"
+    ${UnRegisterCOM} "webmmux.dll"
 
-    ; Unregister encoders
     ${UnRegisterCOM} "dsfFLACEncoder.dll"
     ${UnRegisterCOM} "dsfSpeexEncoder.dll"
     ${UnRegisterCOM} "dsfTheoraEncoder.dll"
     ${UnRegisterCOM} "dsfVorbisEncoder.dll"
+    ${UnRegisterCOM} "vp8encoder.dll"
 
-    ; Unregister decoders
     ${UnRegisterCOM} "dsfNativeFLACSource.dll"
     ${UnRegisterCOM} "dsfSpeexDecoder.dll"
     ${UnRegisterCOM} "dsfTheoraDecoder.dll"
     ${UnRegisterCOM} "dsfFLACDecoder.dll"
     ${UnRegisterCOM} "dsfVorbisDecoder.dll"
+    ${UnRegisterCOM} "vp8decoder.dll"
 
     ${UnRegisterCOM} "AxPlayer.dll"
 
     SetDetailsPrint textonly
     DetailPrint "Deleting Registry Entries ..."
     SetDetailsPrint listonly
+    
     ; Get rid of all the registry keys we made for directshow and WMP
 
     ; Media Type Groups entries - 7
     ${DeleteWmpMediaGroup} "FLAC" "Audio"
     ${DeleteWmpMediaGroup} "OGA" "Audio"
     ${DeleteWmpMediaGroup} "OGG" "Audio"
-    ${DeleteWmpMediaGroup} "AXA" "Audio"
-    ${DeleteWmpMediaGroup} "SPX" "Audio"
-    ${DeleteWmpMediaGroup} "AXV" "Video"
     ${DeleteWmpMediaGroup} "OGV" "Video"
+    ${DeleteWmpMediaGroup} "SPX" "Audio"
+    ${DeleteWmpMediaGroup} "WEBA" "Audio"
+    ${DeleteWmpMediaGroup} "WEBM" "Video"
 
-    ; WMP MIME Type entries - 7
+    ; WMP MIME Type entries  - 6
     ${DeleteWmpMimeType} "application/ogg"
     ${DeleteWmpMimeType} "audio/flac"
     ${DeleteWmpMimeType} "audio/ogg"
     ${DeleteWmpMimeType} "video/ogg"
-    ${DeleteWmpMimeType} "application/annodex"
-    ${DeleteWmpMimeType} "audio/annodex"
-    ${DeleteWmpMimeType} "video/annodex"
+    ${DeleteWmpMimeType} "audio/webm"
+    ${DeleteWmpMimeType} "video/webm"
 
-    ; MIME Type entries - 7
+    ; MIME Type entries - 6
     ${DeleteMimeType} "application/ogg"
     ${DeleteMimeType} "audio/flac"
     ${DeleteMimeType} "audio/ogg"
     ${DeleteMimeType} "video/ogg"
-    ${DeleteMimeType} "application/annodex"
-    ${DeleteMimeType} "audio/annodex" 
-    ${DeleteMimeType} "video/annodex" 
+    ${DeleteMimeType} "audio/webm"
+    ${DeleteMimeType} "video/webm"
 
-    ; File Extension Entries - 8
+    ; File Extension Entries - 7
     ${DeleteWmpExtension} ".flac"
     ${DeleteWmpExtension} ".oga"
     ${DeleteWmpExtension} ".ogg"
     ${DeleteWmpExtension} ".ogv"
     ${DeleteWmpExtension} ".spx"
-    ${DeleteWmpExtension} ".anx"
-    ${DeleteWmpExtension} ".axa"
-    ${DeleteWmpExtension} ".axv"
+    ${DeleteWmpExtension} ".weba"
+    ${DeleteWmpExtension} ".webm"
 
-    ; Extension to filter mapping - 8
-    ${DeleteMediaTypeExtension} ".anx"
-    ${DeleteMediaTypeExtension} ".axa"
-    ${DeleteMediaTypeExtension} ".axv"
+    ; Extension to filter mapping - 7
     ${DeleteMediaTypeExtension} ".flac"
     ${DeleteMediaTypeExtension} ".oga"
     ${DeleteMediaTypeExtension} ".ogg"
     ${DeleteMediaTypeExtension} ".ogv"
     ${DeleteMediaTypeExtension} ".spx"
+    ${DeleteMediaTypeExtension} ".weba"
+    ${DeleteMediaTypeExtension} ".webm"
 
-    ; Extension to filter mapping for http - 7
+    ; Extension to filter mapping for http - 6
+    ${DeleteHttpExtensionSource} ".OGA"
     ${DeleteHttpExtensionSource} ".OGG"
     ${DeleteHttpExtensionSource} ".OGV"
-    ${DeleteHttpExtensionSource} ".OGA"
     ${DeleteHttpExtensionSource} ".SPX"
-    ${DeleteHttpExtensionSource} ".ANX"
-    ${DeleteHttpExtensionSource} ".AXA"
-    ${DeleteHttpExtensionSource} ".AXV"
-    ; TODO::: FLAC
+    ${DeleteHttpExtensionSource} ".WEBA"
+    ${DeleteHttpExtensionSource} ".WEBM"
+    ; TODO: FLAC
 
-    ; MLS Perceived type - 6
-    ${DeleteMediaPlayerMlsExtension} "ogv"
+    ; MLS Perceived type - 7
+    ${DeleteMediaPlayerMlsExtension} "flac"  
     ${DeleteMediaPlayerMlsExtension} "oga"
     ${DeleteMediaPlayerMlsExtension} "ogg"
-    ${DeleteMediaPlayerMlsExtension} "axa"
-    ${DeleteMediaPlayerMlsExtension} "axv"
+    ${DeleteMediaPlayerMlsExtension} "ogv"
     ${DeleteMediaPlayerMlsExtension} "spx"
-    ${DeleteMediaPlayerMlsExtension} "flac"  
+    ${DeleteMediaPlayerMlsExtension} "weba"
+    ${DeleteMediaPlayerMlsExtension} "webm"
 
-    ; Point the extension to the handlers
+    ; Point the extension to the handlers - 7
     ${UnRegisterWmpType} "WMP.OggFile"
     ${UnRegisterWmpType} "WMP.OgaFile"
     ${UnRegisterWmpType} "WMP.OgvFile"
     ${UnRegisterWmpType} "WMP.SpxFile"
     ${UnRegisterWmpType} "WMP.FlacFile"
+    ${UnRegisterWmpType} "WMP.WebaFile"
+    ${UnRegisterWmpType} "WMP.WebmFile"
 
-    ; Delete all the registered supported types from wmplayer.exe's list
+    ; Delete all the registered supported types from wmplayer.exe's list - 7
     ${UnRegisterExtension} ".ogg"
     ${UnRegisterExtension} ".oga"
     ${UnRegisterExtension} ".ogv"
     ${UnRegisterExtension} ".spx"
     ${UnRegisterExtension} ".flac"
+    ${UnRegisterExtension} ".weba"
+    ${UnRegisterExtension} ".webm"
 
     ; Delete the "OggS" regonition pattern
     ${DeleteOggRecognitionPattern}
 
+    ; Delete "EBML" recognition pattern
+    ${DeleteWebmRecognitionPattern}
+
     ; Delete the AxPlayer XMLNamespace registry value
     ${UnRegisterAxPlayerXmlNamespace}
 
@@ -628,27 +616,25 @@
     ${DeleteFile} "dsfTheoraEncoder.dll"
     ${DeleteFile} "dsfSpeexEncoder.dll"
     ${DeleteFile} "dsfFLACEncoder.dll"
+    ${DeleteFile} "vp8encoder.dll"
 
     ${DeleteFile} "dsfVorbisDecoder.dll"
     ${DeleteFile} "dsfFLACDecoder.dll"
+    ${DeleteFile} "dsfNativeFLACSource.dll"
     ${DeleteFile} "dsfTheoraDecoder.dll"
     ${DeleteFile} "dsfSpeexDecoder.dll"
+    ${DeleteFile} "vp8decoder.dll"
 
-    ${DeleteFile} "dsfNativeFLACSource.dll"
-
-    ${DeleteFile} "dsfCMMLDecoder.dll"
-    ${DeleteFile} "dsfCMMLRawSource.dll"
-
     ${DeleteFile} "dsfOggDemux2.dll"
     ${DeleteFile} "dsfOggMux.dll"
+    ${DeleteFile} "webmsplit.dll"
+    ${DeleteFile} "webmmux.dll"
 
-    ${DeleteFile} "dsfAnxMux.dll"
-    ;  ${DeleteFile} "dsfAnxDemux.dll"
     ${DeleteFile} "wmpinfo.dll"
-
+    
     ${DeleteFile} "AxPlayer.dll"
 
-    ; Delete text files - 7
+    ; Delete text files - 6
     Delete "$INSTDIR\README"
     Delete "$INSTDIR\COPYRIGHTS.rtf"
     Delete "$INSTDIR\COPYRIGHTS"
@@ -662,6 +648,7 @@
 
     ; Delete icons - 2
     Delete "$INSTDIR\xifish.ico"
+    Delete "$INSTDIR\webm.ico"
 
     ;Delete accesory files, links etc.
     Delete "$SMPROGRAMS\$ICONS_GROUP\Website.url"

Modified: trunk/oggdsf/sln/oggdsf_vs2005/oggdsf.sln
===================================================================
--- trunk/oggdsf/sln/oggdsf_vs2005/oggdsf.sln	2010-06-16 13:32:35 UTC (rev 17292)
+++ trunk/oggdsf/sln/oggdsf_vs2005/oggdsf.sln	2010-06-16 22:32:53 UTC (rev 17293)
@@ -1,56 +1,15 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfCMMLDecoder", "..\..\src\lib\codecs\cmml\dsfCMMLDecoder\dsfCMMLDecoder-2005.vcproj", "{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}"
-	ProjectSection(ProjectDependencies) = postProject
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
-		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
-		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-	EndProjectSection
-	ProjectSection(WebsiteProperties) = preProject
-		Debug.AspNetCompiler.Debug = "True"
-		Release.AspNetCompiler.Debug = "False"
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfCMMLRawSource", "..\..\src\lib\codecs\cmml\dsfCMMLRawSource\dsfCMMLRawSource-2005.vcproj", "{35D263B8-C0C4-4F28-AC6D-07F8C82A01B8}"
-	ProjectSection(ProjectDependencies) = postProject
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
-		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
-		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC} = {37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}
-		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
-	EndProjectSection
-	ProjectSection(WebsiteProperties) = preProject
-		Debug.AspNetCompiler.Debug = "True"
-		Release.AspNetCompiler.Debug = "False"
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libFLACHelper", "..\..\src\lib\codecs\flac\libs\libFLACHelper\libFLACHelper-2005.vcproj", "{7F213248-16F2-4AAE-B941-C402670082BC}"
 	ProjectSection(ProjectDependencies) = postProject
-		{4CEFBC83-C215-11DB-8314-0800200C9A66} = {4CEFBC83-C215-11DB-8314-0800200C9A66}
 		{4CEFBC85-C215-11DB-8314-0800200C9A66} = {4CEFBC85-C215-11DB-8314-0800200C9A66}
+		{4CEFBC83-C215-11DB-8314-0800200C9A66} = {4CEFBC83-C215-11DB-8314-0800200C9A66}
 	EndProjectSection
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfAnxMux", "..\..\src\lib\core\directshow\dsfAnxMux\dsfAnxMux-2005.vcproj", "{685D495F-1620-459A-9EE3-BAD4F619B2C2}"
-	ProjectSection(ProjectDependencies) = postProject
-		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
-		{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
-		{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834} = {6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-		{7F213248-16F2-4AAE-B941-C402670082BC} = {7F213248-16F2-4AAE-B941-C402670082BC}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-	EndProjectSection
-	ProjectSection(WebsiteProperties) = preProject
-		Debug.AspNetCompiler.Debug = "True"
-		Release.AspNetCompiler.Debug = "False"
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BaseClasses", "..\..\src\lib\core\directshow\BaseClasses\baseclasses-2005.vcproj", "{4CBC0173-27E6-4218-AE06-5EFDCA7B2547}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
@@ -73,11 +32,11 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfNativeFLACSource", "..\..\src\lib\codecs\flac\filters\dsfNativeFLACSource\dsfNativeFLACSource-2005.vcproj", "{43DEE58F-CEC6-49B4-BC06-3D28978BAB63}"
 	ProjectSection(ProjectDependencies) = postProject
-		{4AB55B4D-8F56-40CF-9AFA-7C161EE1B99D} = {4AB55B4D-8F56-40CF-9AFA-7C161EE1B99D}
-		{4CEFBC83-C215-11DB-8314-0800200C9A66} = {4CEFBC83-C215-11DB-8314-0800200C9A66}
-		{4CEFBC85-C215-11DB-8314-0800200C9A66} = {4CEFBC85-C215-11DB-8314-0800200C9A66}
-		{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
 		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
+		{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
+		{4CEFBC85-C215-11DB-8314-0800200C9A66} = {4CEFBC85-C215-11DB-8314-0800200C9A66}
+		{4CEFBC83-C215-11DB-8314-0800200C9A66} = {4CEFBC83-C215-11DB-8314-0800200C9A66}
+		{4AB55B4D-8F56-40CF-9AFA-7C161EE1B99D} = {4AB55B4D-8F56-40CF-9AFA-7C161EE1B99D}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libDirectshowAbstracts", "..\..\src\lib\core\directshow\libDirectshowAbstracts\libDirectshowAbstracts-2005.vcproj", "{EA7091BB-9906-41DF-9738-F4858A136086}"
@@ -86,84 +45,75 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfOggMux", "..\..\src\lib\core\directshow\dsfOggMux\dsfOggMux-2005.vcproj", "{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}"
 	ProjectSection(ProjectDependencies) = postProject
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{7F213248-16F2-4AAE-B941-C402670082BC} = {7F213248-16F2-4AAE-B941-C402670082BC}
-		{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
 		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfFLACDecoder", "..\..\src\lib\codecs\flac\filters\dsfFLACDecoder\dsfFLACDecoder-2005.vcproj", "{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}"
-	ProjectSection(ProjectDependencies) = postProject
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{4AB55B4D-8F56-40CF-9AFA-7C161EE1B99D} = {4AB55B4D-8F56-40CF-9AFA-7C161EE1B99D}
-		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 		{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
-		{4CEFBC85-C215-11DB-8314-0800200C9A66} = {4CEFBC85-C215-11DB-8314-0800200C9A66}
-		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
 		{7F213248-16F2-4AAE-B941-C402670082BC} = {7F213248-16F2-4AAE-B941-C402670082BC}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfFLACEncoder", "..\..\src\lib\codecs\flac\filters\dsfFLACEncoder\dsfFLACEncoder-2005.vcproj", "{7143478E-0C1A-4C8B-B12C-4BFEF591F36F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfFLACDecoder", "..\..\src\lib\codecs\flac\filters\dsfFLACDecoder\dsfFLACDecoder-2005.vcproj", "{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}"
 	ProjectSection(ProjectDependencies) = postProject
+		{7F213248-16F2-4AAE-B941-C402670082BC} = {7F213248-16F2-4AAE-B941-C402670082BC}
 		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
 		{4CEFBC85-C215-11DB-8314-0800200C9A66} = {4CEFBC85-C215-11DB-8314-0800200C9A66}
-		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 		{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 		{4AB55B4D-8F56-40CF-9AFA-7C161EE1B99D} = {4AB55B4D-8F56-40CF-9AFA-7C161EE1B99D}
-		{7F213248-16F2-4AAE-B941-C402670082BC} = {7F213248-16F2-4AAE-B941-C402670082BC}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfOggDemux2", "..\..\src\lib\core\directshow\dsfOggDemux2\dsfOggDemux2-2005.vcproj", "{304B710A-7355-471C-A4A8-9E8F6D640E6D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfFLACEncoder", "..\..\src\lib\codecs\flac\filters\dsfFLACEncoder\dsfFLACEncoder-2005.vcproj", "{7143478E-0C1A-4C8B-B12C-4BFEF591F36F}"
 	ProjectSection(ProjectDependencies) = postProject
+		{7F213248-16F2-4AAE-B941-C402670082BC} = {7F213248-16F2-4AAE-B941-C402670082BC}
+		{4AB55B4D-8F56-40CF-9AFA-7C161EE1B99D} = {4AB55B4D-8F56-40CF-9AFA-7C161EE1B99D}
 		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
 		{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
 		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
+		{4CEFBC85-C215-11DB-8314-0800200C9A66} = {4CEFBC85-C215-11DB-8314-0800200C9A66}
+		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libOOOggSeek", "..\..\src\lib\core\ogg\libOOOggSeek\libOOOggSeek-2005.vcproj", "{9A14F6AC-BC6E-401A-A300-07369BD6C5FE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfOggDemux2", "..\..\src\lib\core\directshow\dsfOggDemux2\dsfOggDemux2-2005.vcproj", "{304B710A-7355-471C-A4A8-9E8F6D640E6D}"
 	ProjectSection(ProjectDependencies) = postProject
 		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
+		{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
 		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libOOOgg", "..\..\src\lib\core\ogg\libOOOgg\libOOOgg-2005.vcproj", "{223ACC19-608E-4E1B-A054-067F0CACB272}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libOOOggSeek", "..\..\src\lib\core\ogg\libOOOggSeek\libOOOggSeek-2005.vcproj", "{9A14F6AC-BC6E-401A-A300-07369BD6C5FE}"
 	ProjectSection(ProjectDependencies) = postProject
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
 		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
-		{15CBFEFF-7965-41F5-B4E2-21E8795C9159} = {15CBFEFF-7965-41F5-B4E2-21E8795C9159}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfSpeexDecoder", "..\..\src\lib\codecs\speex\filters\dsfSpeexDecoder\dsfSpeexDecoder-2005.vcproj", "{3FB9B20E-790A-402F-A02C-B0FBDC5938E3}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libOOOgg", "..\..\src\lib\core\ogg\libOOOgg\libOOOgg-2005.vcproj", "{223ACC19-608E-4E1B-A054-067F0CACB272}"
 	ProjectSection(ProjectDependencies) = postProject
-		{E972C52F-9E85-4D65-B19C-031E511E9DB4} = {E972C52F-9E85-4D65-B19C-031E511E9DB4}
-		{359DBC2D-2BF1-4A1A-BE81-248268F557CC} = {359DBC2D-2BF1-4A1A-BE81-248268F557CC}
-		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
+		{15CBFEFF-7965-41F5-B4E2-21E8795C9159} = {15CBFEFF-7965-41F5-B4E2-21E8795C9159}
 		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
-		{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfSpeexEncoder", "..\..\src\lib\codecs\speex\filters\dsfSpeexEncoder\dsfSpeexEncoder-2005.vcproj", "{419E0701-9C9A-4671-B3B6-79FA206DEE25}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfSpeexDecoder", "..\..\src\lib\codecs\speex\filters\dsfSpeexDecoder\dsfSpeexDecoder-2005.vcproj", "{3FB9B20E-790A-402F-A02C-B0FBDC5938E3}"
 	ProjectSection(ProjectDependencies) = postProject
 		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
+		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
+		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
 		{359DBC2D-2BF1-4A1A-BE81-248268F557CC} = {359DBC2D-2BF1-4A1A-BE81-248268F557CC}
 		{E972C52F-9E85-4D65-B19C-031E511E9DB4} = {E972C52F-9E85-4D65-B19C-031E511E9DB4}
-		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-		{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfTheoraDecoder", "..\..\src\lib\codecs\theora\filters\dsfTheoraDecoder\dsfTheoraDecoder-2005.vcproj", "{11CBDFD6-0D73-40C0-95DF-997C5FD873F2}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfSpeexEncoder", "..\..\src\lib\codecs\speex\filters\dsfSpeexEncoder\dsfSpeexEncoder-2005.vcproj", "{419E0701-9C9A-4671-B3B6-79FA206DEE25}"
 	ProjectSection(ProjectDependencies) = postProject
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
 		{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
-		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
+		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
+		{E972C52F-9E85-4D65-B19C-031E511E9DB4} = {E972C52F-9E85-4D65-B19C-031E511E9DB4}
+		{359DBC2D-2BF1-4A1A-BE81-248268F557CC} = {359DBC2D-2BF1-4A1A-BE81-248268F557CC}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfTheoraEncoder", "..\..\src\lib\codecs\theora\filters\dsfTheoraEncoder\dsfTheoraEncoder-2005.vcproj", "{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfTheoraDecoder", "..\..\src\lib\codecs\theora\filters\dsfTheoraDecoder\dsfTheoraDecoder-2005.vcproj", "{11CBDFD6-0D73-40C0-95DF-997C5FD873F2}"
 	ProjectSection(ProjectDependencies) = postProject
 		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 		{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
@@ -172,56 +122,53 @@
 		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfVorbisDecoder", "..\..\src\lib\codecs\vorbis\filters\dsfVorbisDecoder\dsfVorbisDecoder-2005.vcproj", "{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfTheoraEncoder", "..\..\src\lib\codecs\theora\filters\dsfTheoraEncoder\dsfTheoraEncoder-2005.vcproj", "{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}"
 	ProjectSection(ProjectDependencies) = postProject
-		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
-		{15CBFEFF-7965-41F5-B4E2-21E8795C9159} = {15CBFEFF-7965-41F5-B4E2-21E8795C9159}
 		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
 		{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
+		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfVorbisEncoder", "..\..\src\lib\codecs\vorbis\filters\dsfVorbisEncoder\dsfVorbisEncoder-2005.vcproj", "{D74A626E-C8CB-4787-913E-2E637FC04F2B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfVorbisDecoder", "..\..\src\lib\codecs\vorbis\filters\dsfVorbisDecoder\dsfVorbisDecoder-2005.vcproj", "{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}"
 	ProjectSection(ProjectDependencies) = postProject
-		{15CBFEFF-7965-41F5-B4E2-21E8795C9159} = {15CBFEFF-7965-41F5-B4E2-21E8795C9159}
+		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
 		{C97A67F9-B786-41FA-9FC9-13167FE2BA49} = {C97A67F9-B786-41FA-9FC9-13167FE2BA49}
-		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 		{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
-		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
 		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3A214E06-B95E-4D61-A291-1F8DF2EC10FD} = {3A214E06-B95E-4D61-A291-1F8DF2EC10FD}
+		{15CBFEFF-7965-41F5-B4E2-21E8795C9159} = {15CBFEFF-7965-41F5-B4E2-21E8795C9159}
+		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libAnxHelper", "..\..\src\lib\helper\libAnxHelper\libAnxHelper-2005.vcproj", "{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCMMLParse", "..\..\src\lib\codecs\cmml\libCMMLParse\libCMMLParse-2005.vcproj", "{899EB7AD-26BF-4495-9BE5-EADECCC288B2}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfVorbisEncoder", "..\..\src\lib\codecs\vorbis\filters\dsfVorbisEncoder\dsfVorbisEncoder-2005.vcproj", "{D74A626E-C8CB-4787-913E-2E637FC04F2B}"
 	ProjectSection(ProjectDependencies) = postProject
+		{3A214E06-B95E-4D61-A291-1F8DF2EC10FD} = {3A214E06-B95E-4D61-A291-1F8DF2EC10FD}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
+		{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
 		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
-		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC} = {37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}
+		{C97A67F9-B786-41FA-9FC9-13167FE2BA49} = {C97A67F9-B786-41FA-9FC9-13167FE2BA49}
+		{15CBFEFF-7965-41F5-B4E2-21E8795C9159} = {15CBFEFF-7965-41F5-B4E2-21E8795C9159}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCMMLTags", "..\..\src\lib\codecs\cmml\libCMMLTags\libCMMLTags-2005.vcproj", "{AD38DCC6-B431-4B32-8569-74F3376EF2DA}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libilliCore", "..\..\src\lib\helper\libilliCore\libilliCore-2005.vcproj", "{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libOOOggChef", "..\..\src\lib\helper\libOOOggChef\libOOOggChef-2005.vcproj", "{3D55194E-6732-4A74-A947-EDFF585A0F19}"
 	ProjectSection(ProjectDependencies) = postProject
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2} = {899EB7AD-26BF-4495-9BE5-EADECCC288B2}
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
 		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libOOSpeex", "..\..\src\lib\codecs\speex\libs\libOOSpeex\libOOSpeex-2005.vcproj", "{359DBC2D-2BF1-4A1A-BE81-248268F557CC}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libOOTheora", "..\..\src\lib\codecs\theora\libs\libOOTheora\libOOTheora-2005.vcproj", "{6B20BD7A-644B-4087-9CAC-71B2D68D0231}"
 	ProjectSection(ProjectDependencies) = postProject
-		{15CBFEFF-7965-41F5-B4E2-21E8795C9159} = {15CBFEFF-7965-41F5-B4E2-21E8795C9159}
-		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
-		{653F3841-3F26-49B9-AFCF-091DB4B67031} = {653F3841-3F26-49B9-AFCF-091DB4B67031}
 		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{653F3841-3F26-49B9-AFCF-091DB4B67031} = {653F3841-3F26-49B9-AFCF-091DB4B67031}
+		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
+		{15CBFEFF-7965-41F5-B4E2-21E8795C9159} = {15CBFEFF-7965-41F5-B4E2-21E8795C9159}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libOOTremor", "..\..\src\lib\codecs\vorbis\libs\libOOTremor\libOOTremor-2005.vcproj", "{620C8CE0-D182-4C0E-B83E-05656ECA971B}"
@@ -235,34 +182,26 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspeexdsp", "..\..\src\lib\codecs\speex\libs\libspeex\win32\VS2005\libspeexdsp\libspeexdsp.vcproj", "{E42FDC95-7243-4219-9EA4-ACCE4AB97197}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libTemporalURI", "..\..\src\lib\helper\libTemporalURI\libTemporalURI-2005.vcproj", "{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtheora_static", "..\..\src\lib\codecs\theora\libs\libtheora\win32\VS2005\libtheora\libtheora_static.vcproj", "{653F3841-3F26-49B9-AFCF-091DB4B67031}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtremor", "..\..\src\lib\codecs\vorbis\libs\libtremor\win32\VS2005\libtremor\libtremor.vcproj", "{7A8E774E-DD94-43B8-8758-6F9F656CC8D2}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libVorbisComment", "..\..\src\lib\core\ogg\libVorbisComment\libVorbisComment-2005.vcproj", "{DC4D86E2-72C1-4995-8FB1-0F08655E620A}"
 	ProjectSection(ProjectDependencies) = postProject
-		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libWinCMMLParse", "..\..\src\lib\codecs\cmml\libWinCMMLParse\libWinCMMLParse-2005.vcproj", "{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FLAC", "FLAC", "{8F344F6B-6115-4E0F-8132-7509FBCEC07E}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Theora", "Theora", "{BE2F221F-6AC7-479F-A343-3D6AD5467AD1}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Vorbis", "Vorbis", "{EADB5C21-7F67-43A3-89C8-7D89FF0040C4}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CMML", "CMML", "{2DB94A71-30FC-4521-8386-278E1908918E}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Speex", "Speex", "{B331EAFC-AD9F-4841-B36D-6E42673707B4}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Ogg", "Ogg", "{D23A7CD4-0625-44ED-9CA1-6E5302EDBC71}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Annodex", "Annodex", "{D9FCA9D2-A980-4D8B-94AE-803307DF99FC}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wmpinfo", "..\..\src\lib\helper\wmpinfo\wmpinfo-2005.vcproj", "{CF9BAF67-3ABB-4D96-A211-70532D2AA95A}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AxPlayer", "..\..\src\lib\plugin\AxPlayer\AxPlayer-2005.vcproj", "{C2C1F096-2541-4B13-A57E-52F2368A0E36}"
@@ -311,34 +250,6 @@
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}.Debug|Win32.Build.0 = Debug|Win32
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}.Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Debug|Win32
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Debug|Win32
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}.Debug|x64.ActiveCfg = Debug|x64
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}.Debug|x64.Build.0 = Debug|x64
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}.Release|Win32.ActiveCfg = Release|Win32
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}.Release|Win32.Build.0 = Release|Win32
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Win32
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}.Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Release|Win32
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}.Release|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Release|Win32
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}.Release|x64.ActiveCfg = Release|x64
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}.Release|x64.Build.0 = Release|x64
-		{35D263B8-C0C4-4F28-AC6D-07F8C82A01B8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{35D263B8-C0C4-4F28-AC6D-07F8C82A01B8}.Debug|Win32.Build.0 = Debug|Win32
-		{35D263B8-C0C4-4F28-AC6D-07F8C82A01B8}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32
-		{35D263B8-C0C4-4F28-AC6D-07F8C82A01B8}.Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Debug|Win32
-		{35D263B8-C0C4-4F28-AC6D-07F8C82A01B8}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Debug|Win32
-		{35D263B8-C0C4-4F28-AC6D-07F8C82A01B8}.Debug|x64.ActiveCfg = Debug|x64
-		{35D263B8-C0C4-4F28-AC6D-07F8C82A01B8}.Debug|x64.Build.0 = Debug|x64
-		{35D263B8-C0C4-4F28-AC6D-07F8C82A01B8}.Release|Win32.ActiveCfg = Release|Win32
-		{35D263B8-C0C4-4F28-AC6D-07F8C82A01B8}.Release|Win32.Build.0 = Release|Win32
-		{35D263B8-C0C4-4F28-AC6D-07F8C82A01B8}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Win32
-		{35D263B8-C0C4-4F28-AC6D-07F8C82A01B8}.Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Release|Win32
-		{35D263B8-C0C4-4F28-AC6D-07F8C82A01B8}.Release|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Release|Win32
-		{35D263B8-C0C4-4F28-AC6D-07F8C82A01B8}.Release|x64.ActiveCfg = Release|x64
-		{35D263B8-C0C4-4F28-AC6D-07F8C82A01B8}.Release|x64.Build.0 = Release|x64
 		{7F213248-16F2-4AAE-B941-C402670082BC}.Debug|Win32.ActiveCfg = Debug|Win32
 		{7F213248-16F2-4AAE-B941-C402670082BC}.Debug|Win32.Build.0 = Debug|Win32
 		{7F213248-16F2-4AAE-B941-C402670082BC}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32
@@ -353,20 +264,6 @@
 		{7F213248-16F2-4AAE-B941-C402670082BC}.Release|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Release|Win32
 		{7F213248-16F2-4AAE-B941-C402670082BC}.Release|x64.ActiveCfg = Release|x64
 		{7F213248-16F2-4AAE-B941-C402670082BC}.Release|x64.Build.0 = Release|x64
-		{685D495F-1620-459A-9EE3-BAD4F619B2C2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{685D495F-1620-459A-9EE3-BAD4F619B2C2}.Debug|Win32.Build.0 = Debug|Win32
-		{685D495F-1620-459A-9EE3-BAD4F619B2C2}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32
-		{685D495F-1620-459A-9EE3-BAD4F619B2C2}.Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Debug|Win32
-		{685D495F-1620-459A-9EE3-BAD4F619B2C2}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Debug|Win32
-		{685D495F-1620-459A-9EE3-BAD4F619B2C2}.Debug|x64.ActiveCfg = Debug|x64
-		{685D495F-1620-459A-9EE3-BAD4F619B2C2}.Debug|x64.Build.0 = Debug|x64
-		{685D495F-1620-459A-9EE3-BAD4F619B2C2}.Release|Win32.ActiveCfg = Release|Win32
-		{685D495F-1620-459A-9EE3-BAD4F619B2C2}.Release|Win32.Build.0 = Release|Win32
-		{685D495F-1620-459A-9EE3-BAD4F619B2C2}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Win32
-		{685D495F-1620-459A-9EE3-BAD4F619B2C2}.Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Release|Win32
-		{685D495F-1620-459A-9EE3-BAD4F619B2C2}.Release|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Release|Win32
-		{685D495F-1620-459A-9EE3-BAD4F619B2C2}.Release|x64.ActiveCfg = Release|x64
-		{685D495F-1620-459A-9EE3-BAD4F619B2C2}.Release|x64.Build.0 = Release|x64
 		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547}.Debug|Win32.ActiveCfg = Debug|Win32
 		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547}.Debug|Win32.Build.0 = Debug|Win32
 		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
@@ -883,84 +780,6 @@
 		{D74A626E-C8CB-4787-913E-2E637FC04F2B}.Release|Windows Mobile 6 Professional SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I)
 		{D74A626E-C8CB-4787-913E-2E637FC04F2B}.Release|x64.ActiveCfg = Release|x64
 		{D74A626E-C8CB-4787-913E-2E637FC04F2B}.Release|x64.Build.0 = Release|x64
-		{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}.Debug|Win32.Build.0 = Debug|Win32
-		{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}.Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}.Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Build.0 = Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}.Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
-		{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).Build.0 = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
-		{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
-		{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}.Debug|x64.ActiveCfg = Debug|x64
-		{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}.Debug|x64.Build.0 = Debug|x64
-		{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}.Release|Win32.ActiveCfg = Release|Win32
-		{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}.Release|Win32.Build.0 = Release|Win32
-		{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}.Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}.Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Build.0 = Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}.Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}.Release|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 6 Professional SDK (ARMV4I)
-		{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}.Release|Windows Mobile 6 Professional SDK (ARMV4I).Build.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I)
-		{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}.Release|Windows Mobile 6 Professional SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I)
-		{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}.Release|x64.ActiveCfg = Release|x64
-		{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}.Release|x64.Build.0 = Release|x64
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2}.Debug|Win32.Build.0 = Debug|Win32
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2}.Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2}.Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Build.0 = Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2}.Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).Build.0 = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2}.Debug|x64.ActiveCfg = Debug|x64
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2}.Debug|x64.Build.0 = Debug|x64
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2}.Release|Win32.ActiveCfg = Release|Win32
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2}.Release|Win32.Build.0 = Release|Win32
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2}.Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2}.Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Build.0 = Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2}.Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2}.Release|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 6 Professional SDK (ARMV4I)
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2}.Release|Windows Mobile 6 Professional SDK (ARMV4I).Build.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I)
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2}.Release|Windows Mobile 6 Professional SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I)
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2}.Release|x64.ActiveCfg = Release|x64
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2}.Release|x64.Build.0 = Release|x64
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Debug|Win32.Build.0 = Debug|Win32
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Build.0 = Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).Build.0 = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Debug|x64.ActiveCfg = Debug|x64
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Debug|x64.Build.0 = Debug|x64
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Release|Win32.ActiveCfg = Release|Win32
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Release|Win32.Build.0 = Release|Win32
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Build.0 = Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Release|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 6 Professional SDK (ARMV4I)
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Release|Windows Mobile 6 Professional SDK (ARMV4I).Build.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I)
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Release|Windows Mobile 6 Professional SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I)
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Release|x64.ActiveCfg = Release|x64
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Release|x64.Build.0 = Release|x64
 		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}.Debug|Win32.ActiveCfg = Debug|Win32
 		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}.Debug|Win32.Build.0 = Debug|Win32
 		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
@@ -1169,32 +988,6 @@
 		{E42FDC95-7243-4219-9EA4-ACCE4AB97197}.Release|Windows Mobile 6 Professional SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I)
 		{E42FDC95-7243-4219-9EA4-ACCE4AB97197}.Release|x64.ActiveCfg = Release|x64
 		{E42FDC95-7243-4219-9EA4-ACCE4AB97197}.Release|x64.Build.0 = Release|x64
-		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}.Debug|Win32.Build.0 = Debug|Win32
-		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}.Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}.Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Build.0 = Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}.Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
-		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).Build.0 = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
-		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
-		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}.Debug|x64.ActiveCfg = Debug|x64
-		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}.Debug|x64.Build.0 = Debug|x64
-		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}.Release|Win32.ActiveCfg = Release|Win32
-		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}.Release|Win32.Build.0 = Release|Win32
-		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}.Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}.Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Build.0 = Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}.Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}.Release|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 6 Professional SDK (ARMV4I)
-		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}.Release|Windows Mobile 6 Professional SDK (ARMV4I).Build.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I)
-		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}.Release|Windows Mobile 6 Professional SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I)
-		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}.Release|x64.ActiveCfg = Release|x64
-		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}.Release|x64.Build.0 = Release|x64
 		{653F3841-3F26-49B9-AFCF-091DB4B67031}.Debug|Win32.ActiveCfg = Debug|Win32
 		{653F3841-3F26-49B9-AFCF-091DB4B67031}.Debug|Win32.Build.0 = Debug|Win32
 		{653F3841-3F26-49B9-AFCF-091DB4B67031}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
@@ -1273,32 +1066,6 @@
 		{DC4D86E2-72C1-4995-8FB1-0F08655E620A}.Release|Windows Mobile 6 Professional SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I)
 		{DC4D86E2-72C1-4995-8FB1-0F08655E620A}.Release|x64.ActiveCfg = Release|x64
 		{DC4D86E2-72C1-4995-8FB1-0F08655E620A}.Release|x64.Build.0 = Release|x64
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Debug|Win32.ActiveCfg = Debug|Win32
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Debug|Win32.Build.0 = Debug|Win32
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Build.0 = Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).Build.0 = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Debug|x64.ActiveCfg = Debug|x64
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Debug|x64.Build.0 = Debug|x64
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Release|Win32.ActiveCfg = Release|Win32
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Release|Win32.Build.0 = Release|Win32
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Build.0 = Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Release|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 6 Professional SDK (ARMV4I)
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Release|Windows Mobile 6 Professional SDK (ARMV4I).Build.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I)
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Release|Windows Mobile 6 Professional SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I)
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Release|x64.ActiveCfg = Release|x64
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Release|x64.Build.0 = Release|x64
 		{CF9BAF67-3ABB-4D96-A211-70532D2AA95A}.Debug|Win32.ActiveCfg = Debug|Win32
 		{CF9BAF67-3ABB-4D96-A211-70532D2AA95A}.Debug|Win32.Build.0 = Debug|Win32
 		{CF9BAF67-3ABB-4D96-A211-70532D2AA95A}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
@@ -1442,11 +1209,6 @@
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{35D263B8-C0C4-4F28-AC6D-07F8C82A01B8} = {2DB94A71-30FC-4521-8386-278E1908918E}
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2} = {2DB94A71-30FC-4521-8386-278E1908918E}
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {2DB94A71-30FC-4521-8386-278E1908918E}
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {2DB94A71-30FC-4521-8386-278E1908918E}
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {2DB94A71-30FC-4521-8386-278E1908918E}
 		{4CEFBC83-C215-11DB-8314-0800200C9A66} = {8F344F6B-6115-4E0F-8132-7509FBCEC07E}
 		{4CEFBC85-C215-11DB-8314-0800200C9A66} = {8F344F6B-6115-4E0F-8132-7509FBCEC07E}
 		{43DEE58F-CEC6-49B4-BC06-3D28978BAB63} = {8F344F6B-6115-4E0F-8132-7509FBCEC07E}
@@ -1454,8 +1216,6 @@
 		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {8F344F6B-6115-4E0F-8132-7509FBCEC07E}
 		{7143478E-0C1A-4C8B-B12C-4BFEF591F36F} = {8F344F6B-6115-4E0F-8132-7509FBCEC07E}
 		{7F213248-16F2-4AAE-B941-C402670082BC} = {8F344F6B-6115-4E0F-8132-7509FBCEC07E}
-		{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834} = {D9FCA9D2-A980-4D8B-94AE-803307DF99FC}
-		{685D495F-1620-459A-9EE3-BAD4F619B2C2} = {D9FCA9D2-A980-4D8B-94AE-803307DF99FC}
 		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {D23A7CD4-0625-44ED-9CA1-6E5302EDBC71}
 		{304B710A-7355-471C-A4A8-9E8F6D640E6D} = {D23A7CD4-0625-44ED-9CA1-6E5302EDBC71}
 		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {D23A7CD4-0625-44ED-9CA1-6E5302EDBC71}

Modified: trunk/oggdsf/sln/oggdsf_vs2008/oggdsf.sln
===================================================================
--- trunk/oggdsf/sln/oggdsf_vs2008/oggdsf.sln	2010-06-16 13:32:35 UTC (rev 17292)
+++ trunk/oggdsf/sln/oggdsf_vs2008/oggdsf.sln	2010-06-16 22:32:53 UTC (rev 17293)
@@ -1,56 +1,15 @@
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfCMMLDecoder", "..\..\src\lib\codecs\cmml\dsfCMMLDecoder\dsfCMMLDecoder.vcproj", "{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}"
-	ProjectSection(ProjectDependencies) = postProject
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
-		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
-		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-	EndProjectSection
-	ProjectSection(WebsiteProperties) = preProject
-		Debug.AspNetCompiler.Debug = "True"
-		Release.AspNetCompiler.Debug = "False"
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfCMMLRawSource", "..\..\src\lib\codecs\cmml\dsfCMMLRawSource\dsfCMMLRawSource.vcproj", "{35D263B8-C0C4-4F28-AC6D-07F8C82A01B8}"
-	ProjectSection(ProjectDependencies) = postProject
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
-		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
-		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC} = {37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}
-		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {23BAAF7B-AEC3-4812-AA91-7E5061E83A39}
-	EndProjectSection
-	ProjectSection(WebsiteProperties) = preProject
-		Debug.AspNetCompiler.Debug = "True"
-		Release.AspNetCompiler.Debug = "False"
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libFLACHelper", "..\..\src\lib\codecs\flac\libs\libFLACHelper\libFLACHelper.vcproj", "{7F213248-16F2-4AAE-B941-C402670082BC}"
 	ProjectSection(ProjectDependencies) = postProject
-		{4CEFBC84-C215-11DB-8314-0800200C9A66} = {4CEFBC84-C215-11DB-8314-0800200C9A66}
 		{4CEFBC86-C215-11DB-8314-0800200C9A66} = {4CEFBC86-C215-11DB-8314-0800200C9A66}
+		{4CEFBC84-C215-11DB-8314-0800200C9A66} = {4CEFBC84-C215-11DB-8314-0800200C9A66}
 	EndProjectSection
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfAnxMux", "..\..\src\lib\core\directshow\dsfAnxMux\dsfAnxMux.vcproj", "{685D495F-1620-459A-9EE3-BAD4F619B2C2}"
-	ProjectSection(ProjectDependencies) = postProject
-		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
-		{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
-		{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834} = {6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}
-		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}
-		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-		{7F213248-16F2-4AAE-B941-C402670082BC} = {7F213248-16F2-4AAE-B941-C402670082BC}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-	EndProjectSection
-	ProjectSection(WebsiteProperties) = preProject
-		Debug.AspNetCompiler.Debug = "True"
-		Release.AspNetCompiler.Debug = "False"
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BaseClasses", "..\..\src\lib\core\directshow\BaseClasses\baseclasses.vcproj", "{4CBC0173-27E6-4218-AE06-5EFDCA7B2547}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
@@ -73,11 +32,11 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfNativeFLACSource", "..\..\src\lib\codecs\flac\filters\dsfNativeFLACSource\dsfNativeFLACSource.vcproj", "{43DEE58F-CEC6-49B4-BC06-3D28978BAB63}"
 	ProjectSection(ProjectDependencies) = postProject
-		{4AB55B4D-8F56-40CF-9AFA-7C161EE1B99D} = {4AB55B4D-8F56-40CF-9AFA-7C161EE1B99D}
-		{4CEFBC84-C215-11DB-8314-0800200C9A66} = {4CEFBC84-C215-11DB-8314-0800200C9A66}
-		{4CEFBC86-C215-11DB-8314-0800200C9A66} = {4CEFBC86-C215-11DB-8314-0800200C9A66}
-		{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
 		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
+		{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
+		{4CEFBC86-C215-11DB-8314-0800200C9A66} = {4CEFBC86-C215-11DB-8314-0800200C9A66}
+		{4CEFBC84-C215-11DB-8314-0800200C9A66} = {4CEFBC84-C215-11DB-8314-0800200C9A66}
+		{4AB55B4D-8F56-40CF-9AFA-7C161EE1B99D} = {4AB55B4D-8F56-40CF-9AFA-7C161EE1B99D}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libDirectshowAbstracts", "..\..\src\lib\core\directshow\libDirectshowAbstracts\libDirectshowAbstracts.vcproj", "{EA7091BB-9906-41DF-9738-F4858A136086}"
@@ -86,84 +45,75 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfOggMux", "..\..\src\lib\core\directshow\dsfOggMux\dsfOggMux.vcproj", "{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB}"
 	ProjectSection(ProjectDependencies) = postProject
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{7F213248-16F2-4AAE-B941-C402670082BC} = {7F213248-16F2-4AAE-B941-C402670082BC}
-		{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
 		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfFLACDecoder", "..\..\src\lib\codecs\flac\filters\dsfFLACDecoder\dsfFLACDecoder.vcproj", "{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}"
-	ProjectSection(ProjectDependencies) = postProject
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{4AB55B4D-8F56-40CF-9AFA-7C161EE1B99D} = {4AB55B4D-8F56-40CF-9AFA-7C161EE1B99D}
-		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 		{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
-		{4CEFBC86-C215-11DB-8314-0800200C9A66} = {4CEFBC86-C215-11DB-8314-0800200C9A66}
-		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
 		{7F213248-16F2-4AAE-B941-C402670082BC} = {7F213248-16F2-4AAE-B941-C402670082BC}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfFLACEncoder", "..\..\src\lib\codecs\flac\filters\dsfFLACEncoder\dsfFLACEncoder.vcproj", "{7143478E-0C1A-4C8B-B12C-4BFEF591F36F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfFLACDecoder", "..\..\src\lib\codecs\flac\filters\dsfFLACDecoder\dsfFLACDecoder.vcproj", "{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4}"
 	ProjectSection(ProjectDependencies) = postProject
+		{7F213248-16F2-4AAE-B941-C402670082BC} = {7F213248-16F2-4AAE-B941-C402670082BC}
 		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
 		{4CEFBC86-C215-11DB-8314-0800200C9A66} = {4CEFBC86-C215-11DB-8314-0800200C9A66}
-		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 		{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 		{4AB55B4D-8F56-40CF-9AFA-7C161EE1B99D} = {4AB55B4D-8F56-40CF-9AFA-7C161EE1B99D}
-		{7F213248-16F2-4AAE-B941-C402670082BC} = {7F213248-16F2-4AAE-B941-C402670082BC}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfOggDemux2", "..\..\src\lib\core\directshow\dsfOggDemux2\dsfOggDemux2.vcproj", "{304B710A-7355-471C-A4A8-9E8F6D640E6D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfFLACEncoder", "..\..\src\lib\codecs\flac\filters\dsfFLACEncoder\dsfFLACEncoder.vcproj", "{7143478E-0C1A-4C8B-B12C-4BFEF591F36F}"
 	ProjectSection(ProjectDependencies) = postProject
+		{7F213248-16F2-4AAE-B941-C402670082BC} = {7F213248-16F2-4AAE-B941-C402670082BC}
+		{4AB55B4D-8F56-40CF-9AFA-7C161EE1B99D} = {4AB55B4D-8F56-40CF-9AFA-7C161EE1B99D}
 		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
 		{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
 		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
+		{4CEFBC86-C215-11DB-8314-0800200C9A66} = {4CEFBC86-C215-11DB-8314-0800200C9A66}
+		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libOOOggSeek", "..\..\src\lib\core\ogg\libOOOggSeek\libOOOggSeek.vcproj", "{9A14F6AC-BC6E-401A-A300-07369BD6C5FE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfOggDemux2", "..\..\src\lib\core\directshow\dsfOggDemux2\dsfOggDemux2.vcproj", "{304B710A-7355-471C-A4A8-9E8F6D640E6D}"
 	ProjectSection(ProjectDependencies) = postProject
 		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
+		{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
 		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libOOOgg", "..\..\src\lib\core\ogg\libOOOgg\libOOOgg.vcproj", "{223ACC19-608E-4E1B-A054-067F0CACB272}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libOOOggSeek", "..\..\src\lib\core\ogg\libOOOggSeek\libOOOggSeek.vcproj", "{9A14F6AC-BC6E-401A-A300-07369BD6C5FE}"
 	ProjectSection(ProjectDependencies) = postProject
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
 		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
-		{15CBFEFF-7965-41F5-B4E2-21E8795C9159} = {15CBFEFF-7965-41F5-B4E2-21E8795C9159}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfSpeexDecoder", "..\..\src\lib\codecs\speex\filters\dsfSpeexDecoder\dsfSpeexDecoder.vcproj", "{3FB9B20E-790A-402F-A02C-B0FBDC5938E3}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libOOOgg", "..\..\src\lib\core\ogg\libOOOgg\libOOOgg.vcproj", "{223ACC19-608E-4E1B-A054-067F0CACB272}"
 	ProjectSection(ProjectDependencies) = postProject
-		{E972C52F-9E85-4D65-B19C-031E511E9DB4} = {E972C52F-9E85-4D65-B19C-031E511E9DB4}
-		{359DBC2D-2BF1-4A1A-BE81-248268F557CC} = {359DBC2D-2BF1-4A1A-BE81-248268F557CC}
-		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
+		{15CBFEFF-7965-41F5-B4E2-21E8795C9159} = {15CBFEFF-7965-41F5-B4E2-21E8795C9159}
 		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
-		{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfSpeexEncoder", "..\..\src\lib\codecs\speex\filters\dsfSpeexEncoder\dsfSpeexEncoder.vcproj", "{419E0701-9C9A-4671-B3B6-79FA206DEE25}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfSpeexDecoder", "..\..\src\lib\codecs\speex\filters\dsfSpeexDecoder\dsfSpeexDecoder.vcproj", "{3FB9B20E-790A-402F-A02C-B0FBDC5938E3}"
 	ProjectSection(ProjectDependencies) = postProject
 		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
+		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
+		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
 		{359DBC2D-2BF1-4A1A-BE81-248268F557CC} = {359DBC2D-2BF1-4A1A-BE81-248268F557CC}
 		{E972C52F-9E85-4D65-B19C-031E511E9DB4} = {E972C52F-9E85-4D65-B19C-031E511E9DB4}
-		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-		{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfTheoraDecoder", "..\..\src\lib\codecs\theora\filters\dsfTheoraDecoder\dsfTheoraDecoder.vcproj", "{11CBDFD6-0D73-40C0-95DF-997C5FD873F2}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfSpeexEncoder", "..\..\src\lib\codecs\speex\filters\dsfSpeexEncoder\dsfSpeexEncoder.vcproj", "{419E0701-9C9A-4671-B3B6-79FA206DEE25}"
 	ProjectSection(ProjectDependencies) = postProject
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
 		{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
-		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
+		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
+		{E972C52F-9E85-4D65-B19C-031E511E9DB4} = {E972C52F-9E85-4D65-B19C-031E511E9DB4}
+		{359DBC2D-2BF1-4A1A-BE81-248268F557CC} = {359DBC2D-2BF1-4A1A-BE81-248268F557CC}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfTheoraEncoder", "..\..\src\lib\codecs\theora\filters\dsfTheoraEncoder\dsfTheoraEncoder.vcproj", "{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfTheoraDecoder", "..\..\src\lib\codecs\theora\filters\dsfTheoraDecoder\dsfTheoraDecoder.vcproj", "{11CBDFD6-0D73-40C0-95DF-997C5FD873F2}"
 	ProjectSection(ProjectDependencies) = postProject
 		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 		{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
@@ -172,56 +122,53 @@
 		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfVorbisDecoder", "..\..\src\lib\codecs\vorbis\filters\dsfVorbisDecoder\dsfVorbisDecoder.vcproj", "{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfTheoraEncoder", "..\..\src\lib\codecs\theora\filters\dsfTheoraEncoder\dsfTheoraEncoder.vcproj", "{8C91066F-5C96-48BB-BD1F-D30FFD2A57A1}"
 	ProjectSection(ProjectDependencies) = postProject
-		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
-		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
-		{15CBFEFF-7965-41F5-B4E2-21E8795C9159} = {15CBFEFF-7965-41F5-B4E2-21E8795C9159}
 		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
+		{6B20BD7A-644B-4087-9CAC-71B2D68D0231} = {6B20BD7A-644B-4087-9CAC-71B2D68D0231}
 		{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
+		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfVorbisEncoder", "..\..\src\lib\codecs\vorbis\filters\dsfVorbisEncoder\dsfVorbisEncoder.vcproj", "{D74A626E-C8CB-4787-913E-2E637FC04F2B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfVorbisDecoder", "..\..\src\lib\codecs\vorbis\filters\dsfVorbisDecoder\dsfVorbisDecoder.vcproj", "{C2B7DBC0-5AB3-46F5-90E9-05EF1B230AE2}"
 	ProjectSection(ProjectDependencies) = postProject
-		{15CBFEFF-7965-41F5-B4E2-21E8795C9159} = {15CBFEFF-7965-41F5-B4E2-21E8795C9159}
+		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
 		{C97A67F9-B786-41FA-9FC9-13167FE2BA49} = {C97A67F9-B786-41FA-9FC9-13167FE2BA49}
-		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 		{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
-		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
 		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{3A214E06-B95E-4D61-A291-1F8DF2EC10FD} = {3A214E06-B95E-4D61-A291-1F8DF2EC10FD}
+		{15CBFEFF-7965-41F5-B4E2-21E8795C9159} = {15CBFEFF-7965-41F5-B4E2-21E8795C9159}
+		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libAnxHelper", "..\..\src\lib\helper\libAnxHelper\libAnxHelper.vcproj", "{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCMMLParse", "..\..\src\lib\codecs\cmml\libCMMLParse\libCMMLParse.vcproj", "{899EB7AD-26BF-4495-9BE5-EADECCC288B2}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsfVorbisEncoder", "..\..\src\lib\codecs\vorbis\filters\dsfVorbisEncoder\dsfVorbisEncoder.vcproj", "{D74A626E-C8CB-4787-913E-2E637FC04F2B}"
 	ProjectSection(ProjectDependencies) = postProject
+		{3A214E06-B95E-4D61-A291-1F8DF2EC10FD} = {3A214E06-B95E-4D61-A291-1F8DF2EC10FD}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547} = {4CBC0173-27E6-4218-AE06-5EFDCA7B2547}
+		{EA7091BB-9906-41DF-9738-F4858A136086} = {EA7091BB-9906-41DF-9738-F4858A136086}
 		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
-		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC} = {37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}
+		{C97A67F9-B786-41FA-9FC9-13167FE2BA49} = {C97A67F9-B786-41FA-9FC9-13167FE2BA49}
+		{15CBFEFF-7965-41F5-B4E2-21E8795C9159} = {15CBFEFF-7965-41F5-B4E2-21E8795C9159}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCMMLTags", "..\..\src\lib\codecs\cmml\libCMMLTags\libCMMLTags.vcproj", "{AD38DCC6-B431-4B32-8569-74F3376EF2DA}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libilliCore", "..\..\src\lib\helper\libilliCore\libilliCore.vcproj", "{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libOOOggChef", "..\..\src\lib\helper\libOOOggChef\libOOOggChef.vcproj", "{3D55194E-6732-4A74-A947-EDFF585A0F19}"
 	ProjectSection(ProjectDependencies) = postProject
-		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
-		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2} = {899EB7AD-26BF-4495-9BE5-EADECCC288B2}
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {AD38DCC6-B431-4B32-8569-74F3376EF2DA}
 		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
+		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {9A14F6AC-BC6E-401A-A300-07369BD6C5FE}
+		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libOOSpeex", "..\..\src\lib\codecs\speex\libs\libOOSpeex\libOOSpeex.vcproj", "{359DBC2D-2BF1-4A1A-BE81-248268F557CC}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libOOTheora", "..\..\src\lib\codecs\theora\libs\libOOTheora\libOOTheora.vcproj", "{6B20BD7A-644B-4087-9CAC-71B2D68D0231}"
 	ProjectSection(ProjectDependencies) = postProject
-		{15CBFEFF-7965-41F5-B4E2-21E8795C9159} = {15CBFEFF-7965-41F5-B4E2-21E8795C9159}
-		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
-		{653F3841-3F26-49B9-AFCF-091DB4B67031} = {653F3841-3F26-49B9-AFCF-091DB4B67031}
 		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{653F3841-3F26-49B9-AFCF-091DB4B67031} = {653F3841-3F26-49B9-AFCF-091DB4B67031}
+		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
+		{15CBFEFF-7965-41F5-B4E2-21E8795C9159} = {15CBFEFF-7965-41F5-B4E2-21E8795C9159}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libOOTremor", "..\..\src\lib\codecs\vorbis\libs\libOOTremor\libOOTremor.vcproj", "{620C8CE0-D182-4C0E-B83E-05656ECA971B}"
@@ -235,34 +182,26 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspeexdsp", "..\..\src\lib\codecs\speex\libs\libspeex\win32\VS2008\libspeexdsp\libspeexdsp.vcproj", "{03207781-0D1C-4DB3-A71D-45C608F28DBD}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libTemporalURI", "..\..\src\lib\helper\libTemporalURI\libTemporalURI.vcproj", "{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtheora_static", "..\..\src\lib\codecs\theora\libs\libtheora\win32\VS2008\libtheora\libtheora_static.vcproj", "{653F3841-3F26-49B9-AFCF-091DB4B67031}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtremor", "..\..\src\lib\codecs\vorbis\libs\libtremor\win32\VS2008\libtremor\libtremor.vcproj", "{7A8E774E-DD94-43B8-8758-6F9F656CC8D2}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libVorbisComment", "..\..\src\lib\core\ogg\libVorbisComment\libVorbisComment.vcproj", "{DC4D86E2-72C1-4995-8FB1-0F08655E620A}"
 	ProjectSection(ProjectDependencies) = postProject
-		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 		{223ACC19-608E-4E1B-A054-067F0CACB272} = {223ACC19-608E-4E1B-A054-067F0CACB272}
+		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4} = {2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libWinCMMLParse", "..\..\src\lib\codecs\cmml\libWinCMMLParse\libWinCMMLParse.vcproj", "{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FLAC", "FLAC", "{8F344F6B-6115-4E0F-8132-7509FBCEC07E}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Theora", "Theora", "{BE2F221F-6AC7-479F-A343-3D6AD5467AD1}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Vorbis", "Vorbis", "{EADB5C21-7F67-43A3-89C8-7D89FF0040C4}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CMML", "CMML", "{2DB94A71-30FC-4521-8386-278E1908918E}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Speex", "Speex", "{B331EAFC-AD9F-4841-B36D-6E42673707B4}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Ogg", "Ogg", "{D23A7CD4-0625-44ED-9CA1-6E5302EDBC71}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Annodex", "Annodex", "{D9FCA9D2-A980-4D8B-94AE-803307DF99FC}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wmpinfo", "..\..\src\lib\helper\wmpinfo\wmpinfo.vcproj", "{CF9BAF67-3ABB-4D96-A211-70532D2AA95A}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AxPlayer", "..\..\src\lib\plugin\AxPlayer\AxPlayer.vcproj", "{C2C1F096-2541-4B13-A57E-52F2368A0E36}"
@@ -311,34 +250,6 @@
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}.Debug|Win32.Build.0 = Debug|Win32
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}.Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Debug|Win32
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Debug|Win32
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}.Debug|x64.ActiveCfg = Debug|x64
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}.Debug|x64.Build.0 = Debug|x64
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}.Release|Win32.ActiveCfg = Release|Win32
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}.Release|Win32.Build.0 = Release|Win32
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Win32
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}.Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Release|Win32
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}.Release|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Release|Win32
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}.Release|x64.ActiveCfg = Release|x64
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7}.Release|x64.Build.0 = Release|x64
-		{35D263B8-C0C4-4F28-AC6D-07F8C82A01B8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{35D263B8-C0C4-4F28-AC6D-07F8C82A01B8}.Debug|Win32.Build.0 = Debug|Win32
-		{35D263B8-C0C4-4F28-AC6D-07F8C82A01B8}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32
-		{35D263B8-C0C4-4F28-AC6D-07F8C82A01B8}.Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Debug|Win32
-		{35D263B8-C0C4-4F28-AC6D-07F8C82A01B8}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Debug|Win32
-		{35D263B8-C0C4-4F28-AC6D-07F8C82A01B8}.Debug|x64.ActiveCfg = Debug|x64
-		{35D263B8-C0C4-4F28-AC6D-07F8C82A01B8}.Debug|x64.Build.0 = Debug|x64
-		{35D263B8-C0C4-4F28-AC6D-07F8C82A01B8}.Release|Win32.ActiveCfg = Release|Win32
-		{35D263B8-C0C4-4F28-AC6D-07F8C82A01B8}.Release|Win32.Build.0 = Release|Win32
-		{35D263B8-C0C4-4F28-AC6D-07F8C82A01B8}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Win32
-		{35D263B8-C0C4-4F28-AC6D-07F8C82A01B8}.Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Release|Win32
-		{35D263B8-C0C4-4F28-AC6D-07F8C82A01B8}.Release|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Release|Win32
-		{35D263B8-C0C4-4F28-AC6D-07F8C82A01B8}.Release|x64.ActiveCfg = Release|x64
-		{35D263B8-C0C4-4F28-AC6D-07F8C82A01B8}.Release|x64.Build.0 = Release|x64
 		{7F213248-16F2-4AAE-B941-C402670082BC}.Debug|Win32.ActiveCfg = Debug|Win32
 		{7F213248-16F2-4AAE-B941-C402670082BC}.Debug|Win32.Build.0 = Debug|Win32
 		{7F213248-16F2-4AAE-B941-C402670082BC}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32
@@ -353,20 +264,6 @@
 		{7F213248-16F2-4AAE-B941-C402670082BC}.Release|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Release|Win32
 		{7F213248-16F2-4AAE-B941-C402670082BC}.Release|x64.ActiveCfg = Release|x64
 		{7F213248-16F2-4AAE-B941-C402670082BC}.Release|x64.Build.0 = Release|x64
-		{685D495F-1620-459A-9EE3-BAD4F619B2C2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{685D495F-1620-459A-9EE3-BAD4F619B2C2}.Debug|Win32.Build.0 = Debug|Win32
-		{685D495F-1620-459A-9EE3-BAD4F619B2C2}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32
-		{685D495F-1620-459A-9EE3-BAD4F619B2C2}.Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Debug|Win32
-		{685D495F-1620-459A-9EE3-BAD4F619B2C2}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Debug|Win32
-		{685D495F-1620-459A-9EE3-BAD4F619B2C2}.Debug|x64.ActiveCfg = Debug|x64
-		{685D495F-1620-459A-9EE3-BAD4F619B2C2}.Debug|x64.Build.0 = Debug|x64
-		{685D495F-1620-459A-9EE3-BAD4F619B2C2}.Release|Win32.ActiveCfg = Release|Win32
-		{685D495F-1620-459A-9EE3-BAD4F619B2C2}.Release|Win32.Build.0 = Release|Win32
-		{685D495F-1620-459A-9EE3-BAD4F619B2C2}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Win32
-		{685D495F-1620-459A-9EE3-BAD4F619B2C2}.Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Release|Win32
-		{685D495F-1620-459A-9EE3-BAD4F619B2C2}.Release|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Release|Win32
-		{685D495F-1620-459A-9EE3-BAD4F619B2C2}.Release|x64.ActiveCfg = Release|x64
-		{685D495F-1620-459A-9EE3-BAD4F619B2C2}.Release|x64.Build.0 = Release|x64
 		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547}.Debug|Win32.ActiveCfg = Debug|Win32
 		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547}.Debug|Win32.Build.0 = Debug|Win32
 		{4CBC0173-27E6-4218-AE06-5EFDCA7B2547}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
@@ -883,84 +780,6 @@
 		{D74A626E-C8CB-4787-913E-2E637FC04F2B}.Release|Windows Mobile 6 Professional SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I)
 		{D74A626E-C8CB-4787-913E-2E637FC04F2B}.Release|x64.ActiveCfg = Release|x64
 		{D74A626E-C8CB-4787-913E-2E637FC04F2B}.Release|x64.Build.0 = Release|x64
-		{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}.Debug|Win32.Build.0 = Debug|Win32
-		{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}.Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}.Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Build.0 = Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}.Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
-		{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).Build.0 = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
-		{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
-		{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}.Debug|x64.ActiveCfg = Debug|x64
-		{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}.Debug|x64.Build.0 = Debug|x64
-		{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}.Release|Win32.ActiveCfg = Release|Win32
-		{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}.Release|Win32.Build.0 = Release|Win32
-		{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}.Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}.Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Build.0 = Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}.Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}.Release|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 6 Professional SDK (ARMV4I)
-		{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}.Release|Windows Mobile 6 Professional SDK (ARMV4I).Build.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I)
-		{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}.Release|Windows Mobile 6 Professional SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I)
-		{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}.Release|x64.ActiveCfg = Release|x64
-		{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834}.Release|x64.Build.0 = Release|x64
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2}.Debug|Win32.Build.0 = Debug|Win32
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2}.Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2}.Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Build.0 = Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2}.Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).Build.0 = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2}.Debug|x64.ActiveCfg = Debug|x64
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2}.Debug|x64.Build.0 = Debug|x64
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2}.Release|Win32.ActiveCfg = Release|Win32
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2}.Release|Win32.Build.0 = Release|Win32
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2}.Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2}.Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Build.0 = Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2}.Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2}.Release|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 6 Professional SDK (ARMV4I)
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2}.Release|Windows Mobile 6 Professional SDK (ARMV4I).Build.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I)
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2}.Release|Windows Mobile 6 Professional SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I)
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2}.Release|x64.ActiveCfg = Release|x64
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2}.Release|x64.Build.0 = Release|x64
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Debug|Win32.Build.0 = Debug|Win32
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Build.0 = Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).Build.0 = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Debug|x64.ActiveCfg = Debug|x64
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Debug|x64.Build.0 = Debug|x64
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Release|Win32.ActiveCfg = Release|Win32
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Release|Win32.Build.0 = Release|Win32
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Build.0 = Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Release|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 6 Professional SDK (ARMV4I)
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Release|Windows Mobile 6 Professional SDK (ARMV4I).Build.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I)
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Release|Windows Mobile 6 Professional SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I)
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Release|x64.ActiveCfg = Release|x64
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA}.Release|x64.Build.0 = Release|x64
 		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}.Debug|Win32.ActiveCfg = Debug|Win32
 		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}.Debug|Win32.Build.0 = Debug|Win32
 		{2DA569EC-3E22-4BC9-A242-C7A56EB9C6F4}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
@@ -1169,32 +988,6 @@
 		{03207781-0D1C-4DB3-A71D-45C608F28DBD}.Release|Windows Mobile 6 Professional SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I)
 		{03207781-0D1C-4DB3-A71D-45C608F28DBD}.Release|x64.ActiveCfg = Release|x64
 		{03207781-0D1C-4DB3-A71D-45C608F28DBD}.Release|x64.Build.0 = Release|x64
-		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}.Debug|Win32.Build.0 = Debug|Win32
-		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}.Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}.Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Build.0 = Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}.Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
-		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).Build.0 = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
-		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
-		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}.Debug|x64.ActiveCfg = Debug|x64
-		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}.Debug|x64.Build.0 = Debug|x64
-		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}.Release|Win32.ActiveCfg = Release|Win32
-		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}.Release|Win32.Build.0 = Release|Win32
-		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}.Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}.Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Build.0 = Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}.Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}.Release|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 6 Professional SDK (ARMV4I)
-		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}.Release|Windows Mobile 6 Professional SDK (ARMV4I).Build.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I)
-		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}.Release|Windows Mobile 6 Professional SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I)
-		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}.Release|x64.ActiveCfg = Release|x64
-		{37CA269C-45DF-4DF7-9C12-3FE3B651D6FC}.Release|x64.Build.0 = Release|x64
 		{653F3841-3F26-49B9-AFCF-091DB4B67031}.Debug|Win32.ActiveCfg = Debug|Win32
 		{653F3841-3F26-49B9-AFCF-091DB4B67031}.Debug|Win32.Build.0 = Debug|Win32
 		{653F3841-3F26-49B9-AFCF-091DB4B67031}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
@@ -1273,32 +1066,6 @@
 		{DC4D86E2-72C1-4995-8FB1-0F08655E620A}.Release|Windows Mobile 6 Professional SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I)
 		{DC4D86E2-72C1-4995-8FB1-0F08655E620A}.Release|x64.ActiveCfg = Release|x64
 		{DC4D86E2-72C1-4995-8FB1-0F08655E620A}.Release|x64.Build.0 = Release|x64
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Debug|Win32.ActiveCfg = Debug|Win32
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Debug|Win32.Build.0 = Debug|Win32
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Build.0 = Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).Build.0 = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).Deploy.0 = Debug|Windows Mobile 6 Professional SDK (ARMV4I)
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Debug|x64.ActiveCfg = Debug|x64
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Debug|x64.Build.0 = Debug|x64
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Release|Win32.ActiveCfg = Release|Win32
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Release|Win32.Build.0 = Release|Win32
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Build.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Build.0 = Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Release|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Release|Windows Mobile 6 Professional SDK (ARMV4I)
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Release|Windows Mobile 6 Professional SDK (ARMV4I).Build.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I)
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Release|Windows Mobile 6 Professional SDK (ARMV4I).Deploy.0 = Release|Windows Mobile 6 Professional SDK (ARMV4I)
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Release|x64.ActiveCfg = Release|x64
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39}.Release|x64.Build.0 = Release|x64
 		{CF9BAF67-3ABB-4D96-A211-70532D2AA95A}.Debug|Win32.ActiveCfg = Debug|Win32
 		{CF9BAF67-3ABB-4D96-A211-70532D2AA95A}.Debug|Win32.Build.0 = Debug|Win32
 		{CF9BAF67-3ABB-4D96-A211-70532D2AA95A}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)
@@ -1442,11 +1209,6 @@
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{35D263B8-C0C4-4F28-AC6D-07F8C82A01B8} = {2DB94A71-30FC-4521-8386-278E1908918E}
-		{899EB7AD-26BF-4495-9BE5-EADECCC288B2} = {2DB94A71-30FC-4521-8386-278E1908918E}
-		{AD38DCC6-B431-4B32-8569-74F3376EF2DA} = {2DB94A71-30FC-4521-8386-278E1908918E}
-		{23BAAF7B-AEC3-4812-AA91-7E5061E83A39} = {2DB94A71-30FC-4521-8386-278E1908918E}
-		{6B269BA6-6A18-41EF-A82C-03B6B5D4BCA7} = {2DB94A71-30FC-4521-8386-278E1908918E}
 		{4CEFBC84-C215-11DB-8314-0800200C9A66} = {8F344F6B-6115-4E0F-8132-7509FBCEC07E}
 		{4CEFBC86-C215-11DB-8314-0800200C9A66} = {8F344F6B-6115-4E0F-8132-7509FBCEC07E}
 		{43DEE58F-CEC6-49B4-BC06-3D28978BAB63} = {8F344F6B-6115-4E0F-8132-7509FBCEC07E}
@@ -1454,8 +1216,6 @@
 		{DE1073F1-71D6-477E-A7C1-6E4F0AACCBF4} = {8F344F6B-6115-4E0F-8132-7509FBCEC07E}
 		{7143478E-0C1A-4C8B-B12C-4BFEF591F36F} = {8F344F6B-6115-4E0F-8132-7509FBCEC07E}
 		{7F213248-16F2-4AAE-B941-C402670082BC} = {8F344F6B-6115-4E0F-8132-7509FBCEC07E}
-		{6F8DE2AB-BF7A-4A4C-96F0-52BE1D992834} = {D9FCA9D2-A980-4D8B-94AE-803307DF99FC}
-		{685D495F-1620-459A-9EE3-BAD4F619B2C2} = {D9FCA9D2-A980-4D8B-94AE-803307DF99FC}
 		{2EBA839A-CE6E-406E-9A43-CC6FB25A78CB} = {D23A7CD4-0625-44ED-9CA1-6E5302EDBC71}
 		{304B710A-7355-471C-A4A8-9E8F6D640E6D} = {D23A7CD4-0625-44ED-9CA1-6E5302EDBC71}
 		{9A14F6AC-BC6E-401A-A300-07369BD6C5FE} = {D23A7CD4-0625-44ED-9CA1-6E5302EDBC71}

Added: trunk/oggdsf/sln/oggdsf_vs2008/update_from_vs2005.cmd
===================================================================
--- trunk/oggdsf/sln/oggdsf_vs2008/update_from_vs2005.cmd	                        (rev 0)
+++ trunk/oggdsf/sln/oggdsf_vs2008/update_from_vs2005.cmd	2010-06-16 22:32:53 UTC (rev 17293)
@@ -0,0 +1,10 @@
+ at echo off
+copy ..\oggdsf_vs2005\oggdsf.sln oggdsf_2008.sln
+sed -i -s "s/Format Version 9.00/Format Version 10.00/"  oggdsf_2008.sln
+sed -i -s "s/Visual Studio 2005/Visual Studio 2008/"  oggdsf_2008.sln
+sed -i -s "s/-2005.vcproj/.vcproj/g"  oggdsf_2008.sln
+sed -i -s "s/VS2005/VS2008/g"  oggdsf_2008.sln
+sed -i -s "s/_2005/_2008/g"  oggdsf_2008.sln
+sed -i -s "s/vpx.vcproj/vpx_2008.vcproj/g"  oggdsf_2008.sln
+del sed*
+move oggdsf_2008.sln oggdsf.sln
\ No newline at end of file

Modified: trunk/oggdsf/src/lib/codecs/webm/libvpx/build/vpx.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/webm/libvpx/build/vpx.vcproj	2010-06-16 13:32:35 UTC (rev 17292)
+++ trunk/oggdsf/src/lib/codecs/webm/libvpx/build/vpx.vcproj	2010-06-16 22:32:53 UTC (rev 17293)
@@ -17,7 +17,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="yasm.rules"
+			RelativePath=".\yasm.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -30,7 +30,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="copy /b $(ProjectDir)\vpx_config_$(PlatformName).c $(ProjectDir)\vpx_config.c&#x0D;&#x0A;copy /b $(ProjectDir)\vpx_config_$(PlatformName).h $(ProjectDir)\vpx_config.h&#x0D;&#x0A;copy /b $(ProjectDir)\vpx_config_$(PlatformName).asm $(ProjectDir)\vpx_config.asm"
+				CommandLine="copy /b $(ProjectDir)\vpx_config_$(PlatformName).c $(ProjectDir)\vpx_config.c&#x0D;&#x0A;copy /b $(ProjectDir)\vpx_config_$(PlatformName).h $(ProjectDir)\vpx_config.h&#x0D;&#x0A;copy /b $(ProjectDir)\vpx_config_$(PlatformName).asm $(ProjectDir)\vpx_config.asm&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -53,7 +53,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="&quot;.&quot;;&quot;..\src&quot;;&quot;..\src\vpx_codec&quot;;&quot;..\src\vp8\common&quot;;&quot;..\src\vp8\common&quot;;&quot;..\src\vp8\common&quot;;&quot;..\src\vp8\common&quot;;&quot;..\src\vp8\encoder&quot;;&quot;..\src\vp8\common&quot;;&quot;..\src\vp8\common&quot;;&quot;..\src\vp8\common&quot;;&quot;..\src\vp8\common&quot;;&quot;..\src\vp8\decoder&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H=vpx_config.h"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H=vpx_config.h;_BIND_TO_CURRENT_CRT_VERSION"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -90,16 +90,15 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
+			Name="Debug|x64"
 			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="1"
-			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="copy /b $(ProjectDir)\vpx_config_$(PlatformName).c $(ProjectDir)\vpx_config.c&#x0D;&#x0A;copy /b $(ProjectDir)\vpx_config_$(PlatformName).h $(ProjectDir)\vpx_config.h&#x0D;&#x0A;copy /b $(ProjectDir)\vpx_config_$(PlatformName).asm $(ProjectDir)\vpx_config.asm"
+				CommandLine="copy /b $(ProjectDir)\vpx_config_$(PlatformName).c $(ProjectDir)\vpx_config.c&#x0D;&#x0A;copy /b $(ProjectDir)\vpx_config_$(PlatformName).h $(ProjectDir)\vpx_config.h&#x0D;&#x0A;copy /b $(ProjectDir)\vpx_config_$(PlatformName).asm $(ProjectDir)\vpx_config.asm&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -107,6 +106,7 @@
 			<Tool
 				Name="YASM"
 				IncludePaths="&quot;.&quot;;&quot;..\src&quot;;&quot;..\src\vpx_codec&quot;;&quot;..\src\vp8\common&quot;;&quot;..\src\vp8\common&quot;;&quot;..\src\vp8\common&quot;;&quot;..\src\vp8\common&quot;;&quot;..\src\vp8\encoder&quot;;&quot;..\src\vp8\common&quot;;&quot;..\src\vp8\common&quot;;&quot;..\src\vp8\common&quot;;&quot;..\src\vp8\common&quot;;&quot;..\src\vp8\decoder&quot;"
+				Debug="true"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -116,16 +116,18 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				Optimization="0"
 				AdditionalIncludeDirectories="&quot;.&quot;;&quot;..\src&quot;;&quot;..\src\vpx_codec&quot;;&quot;..\src\vp8\common&quot;;&quot;..\src\vp8\common&quot;;&quot;..\src\vp8\common&quot;;&quot;..\src\vp8\common&quot;;&quot;..\src\vp8\encoder&quot;;&quot;..\src\vp8\common&quot;;&quot;..\src\vp8\common&quot;;&quot;..\src\vp8\common&quot;;&quot;..\src\vp8\common&quot;;&quot;..\src\vp8\decoder&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H=vpx_config.h"
-				RuntimeLibrary="2"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H=vpx_config.h;_BIND_TO_CURRENT_CRT_VERSION"
+				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
+				DebugInformationFormat="1"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -138,7 +140,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\vpxmd.lib"
+				OutputFile="$(OutDir)\vpxmdd.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -157,15 +159,16 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
+			Name="Release|Win32"
 			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="1"
+			WholeProgramOptimization="0"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="copy /b $(ProjectDir)\vpx_config_$(PlatformName).c $(ProjectDir)\vpx_config.c&#x0D;&#x0A;copy /b $(ProjectDir)\vpx_config_$(PlatformName).h $(ProjectDir)\vpx_config.h&#x0D;&#x0A;copy /b $(ProjectDir)\vpx_config_$(PlatformName).asm $(ProjectDir)\vpx_config.asm"
+				CommandLine="copy /b $(ProjectDir)\vpx_config_$(PlatformName).c $(ProjectDir)\vpx_config.c&#x0D;&#x0A;copy /b $(ProjectDir)\vpx_config_$(PlatformName).h $(ProjectDir)\vpx_config.h&#x0D;&#x0A;copy /b $(ProjectDir)\vpx_config_$(PlatformName).asm $(ProjectDir)\vpx_config.asm&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -173,7 +176,6 @@
 			<Tool
 				Name="YASM"
 				IncludePaths="&quot;.&quot;;&quot;..\src&quot;;&quot;..\src\vpx_codec&quot;;&quot;..\src\vp8\common&quot;;&quot;..\src\vp8\common&quot;;&quot;..\src\vp8\common&quot;;&quot;..\src\vp8\common&quot;;&quot;..\src\vp8\encoder&quot;;&quot;..\src\vp8\common&quot;;&quot;..\src\vp8\common&quot;;&quot;..\src\vp8\common&quot;;&quot;..\src\vp8\common&quot;;&quot;..\src\vp8\decoder&quot;"
-				Debug="true"
 			/>
 			<Tool
 				Name="VCXMLDataGeneratorTool"
@@ -183,18 +185,16 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
 				AdditionalIncludeDirectories="&quot;.&quot;;&quot;..\src&quot;;&quot;..\src\vpx_codec&quot;;&quot;..\src\vp8\common&quot;;&quot;..\src\vp8\common&quot;;&quot;..\src\vp8\common&quot;;&quot;..\src\vp8\common&quot;;&quot;..\src\vp8\encoder&quot;;&quot;..\src\vp8\common&quot;;&quot;..\src\vp8\common&quot;;&quot;..\src\vp8\common&quot;;&quot;..\src\vp8\common&quot;;&quot;..\src\vp8\decoder&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H=vpx_config.h"
-				RuntimeLibrary="3"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H=vpx_config.h;_BIND_TO_CURRENT_CRT_VERSION"
+				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="1"
+				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -207,7 +207,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\vpxmdd.lib"
+				OutputFile="$(OutDir)\vpxmd.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -235,7 +235,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="copy /b $(ProjectDir)\vpx_config_$(PlatformName).c $(ProjectDir)\vpx_config.c&#x0D;&#x0A;copy /b $(ProjectDir)\vpx_config_$(PlatformName).h $(ProjectDir)\vpx_config.h&#x0D;&#x0A;copy /b $(ProjectDir)\vpx_config_$(PlatformName).asm $(ProjectDir)\vpx_config.asm"
+				CommandLine="copy /b $(ProjectDir)\vpx_config_$(PlatformName).c $(ProjectDir)\vpx_config.c&#x0D;&#x0A;copy /b $(ProjectDir)\vpx_config_$(PlatformName).h $(ProjectDir)\vpx_config.h&#x0D;&#x0A;copy /b $(ProjectDir)\vpx_config_$(PlatformName).asm $(ProjectDir)\vpx_config.asm&#x0D;&#x0A;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -257,7 +257,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="&quot;.&quot;;&quot;..\src&quot;;&quot;..\src\vpx_codec&quot;;&quot;..\src\vp8\common&quot;;&quot;..\src\vp8\common&quot;;&quot;..\src\vp8\common&quot;;&quot;..\src\vp8\common&quot;;&quot;..\src\vp8\encoder&quot;;&quot;..\src\vp8\common&quot;;&quot;..\src\vp8\common&quot;;&quot;..\src\vp8\common&quot;;&quot;..\src\vp8\common&quot;;&quot;..\src\vp8\decoder&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H=vpx_config.h"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H=vpx_config.h;_BIND_TO_CURRENT_CRT_VERSION"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -333,38 +333,10 @@
 			<File
 				RelativePath=".\..\src\vp8\encoder\x86\dct_mmx.asm"
 				>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="YASM"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="YASM"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\..\src\vp8\encoder\x86\dct_sse2.asm"
 				>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="YASM"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="YASM"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\..\src\vp8\common\debugmodes.c"
@@ -389,20 +361,6 @@
 			<File
 				RelativePath=".\..\src\vp8\decoder\x86\dequantize_mmx.asm"
 				>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="YASM"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="YASM"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\..\src\vp8\decoder\detokenize.c"
@@ -415,20 +373,6 @@
 			<File
 				RelativePath=".\..\src\vpx_ports\emms.asm"
 				>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="YASM"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="YASM"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\..\src\vp8\encoder\encodeframe.c"
@@ -449,20 +393,6 @@
 			<File
 				RelativePath=".\..\src\vp8\encoder\x86\encodeopt.asm"
 				>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="YASM"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="YASM"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\..\src\vp8\common\entropy.c"
@@ -499,20 +429,6 @@
 			<File
 				RelativePath=".\..\src\vp8\encoder\x86\fwalsh_sse2.asm"
 				>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="YASM"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="YASM"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\..\src\vpx_scale\generic\gen_scalers.c"
@@ -525,20 +441,6 @@
 			<File
 				RelativePath=".\..\src\vp8\common\x86\idctllm_mmx.asm"
 				>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="YASM"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="YASM"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\..\src\vp8\common\invtrans.c"
@@ -547,38 +449,10 @@
 			<File
 				RelativePath=".\..\src\vp8\common\x86\iwalsh_mmx.asm"
 				>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="YASM"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="YASM"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\..\src\vp8\common\x86\iwalsh_sse2.asm"
 				>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="YASM"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="YASM"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\..\src\vp8\common\loopfilter.c"
@@ -591,38 +465,10 @@
 			<File
 				RelativePath=".\..\src\vp8\common\x86\loopfilter_mmx.asm"
 				>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="YASM"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="YASM"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\..\src\vp8\common\x86\loopfilter_sse2.asm"
 				>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="YASM"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="YASM"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\..\src\vp8\common\x86\loopfilter_x86.c"
@@ -671,38 +517,10 @@
 			<File
 				RelativePath=".\..\src\vp8\common\x86\postproc_mmx.asm"
 				>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="YASM"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="YASM"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\..\src\vp8\common\x86\postproc_sse2.asm"
 				>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="YASM"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="YASM"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\..\src\vp8\common\predictdc.c"
@@ -723,20 +541,6 @@
 			<File
 				RelativePath=".\..\src\vp8\encoder\x86\quantize_mmx.asm"
 				>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="YASM"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="YASM"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\..\src\vp8\encoder\ratectrl.c"
@@ -753,38 +557,10 @@
 			<File
 				RelativePath=".\..\src\vp8\common\x86\recon_mmx.asm"
 				>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="YASM"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="YASM"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\..\src\vp8\common\x86\recon_sse2.asm"
 				>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="YASM"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="YASM"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\..\src\vp8\common\reconinter.c"
@@ -805,74 +581,18 @@
 			<File
 				RelativePath=".\..\src\vp8\encoder\x86\sad_mmx.asm"
 				>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="YASM"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="YASM"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\..\src\vp8\encoder\x86\sad_sse2.asm"
 				>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="YASM"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="YASM"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\..\src\vp8\encoder\x86\sad_sse3.asm"
 				>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="YASM"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="YASM"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\..\src\vp8\encoder\x86\sad_ssse3.asm"
 				>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="YASM"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="YASM"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\..\src\vpx_scale\generic\scalesystemdependant.c"
@@ -893,56 +613,14 @@
 			<File
 				RelativePath=".\..\src\vp8\common\x86\subpixel_mmx.asm"
 				>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="YASM"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="YASM"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\..\src\vp8\common\x86\subpixel_sse2.asm"
 				>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="YASM"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="YASM"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\..\src\vp8\encoder\x86\subtract_mmx.asm"
 				>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="YASM"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="YASM"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\..\src\vp8\common\swapyv12buffer.c"
@@ -979,38 +657,10 @@
 			<File
 				RelativePath=".\..\src\vp8\encoder\x86\variance_impl_mmx.asm"
 				>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="YASM"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="YASM"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\..\src\vp8\encoder\x86\variance_impl_sse2.asm"
 				>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="YASM"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="YASM"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\..\src\vp8\encoder\x86\variance_mmx.c"
@@ -1043,20 +693,6 @@
 			<File
 				RelativePath=".\vpx_config.asm"
 				>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="YASM"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="YASM"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\vpx_config.c"
@@ -1089,20 +725,6 @@
 			<File
 				RelativePath=".\..\src\vpx_ports\x86_abi_support.asm"
 				>
-				<FileConfiguration
-					Name="Debug|x64"
-					>
-					<Tool
-						Name="YASM"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|x64"
-					>
-					<Tool
-						Name="YASM"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath=".\..\src\vp8\encoder\x86\x86_csystemdependent.c"

Modified: trunk/oggdsf/src/lib/codecs/webm/webmdshow/libmkvparser/libmkvparser_2005.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/webm/webmdshow/libmkvparser/libmkvparser_2005.vcproj	2010-06-16 13:32:35 UTC (rev 17292)
+++ trunk/oggdsf/src/lib/codecs/webm/webmdshow/libmkvparser/libmkvparser_2005.vcproj	2010-06-16 22:32:53 UTC (rev 17293)
@@ -44,7 +44,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="$(ProjectDir)\..\common"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;NOMINMAX"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;NOMINMAX;_BIND_TO_CURRENT_CRT_VERSION"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -108,7 +108,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="$(ProjectDir)\..\common"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;NOMINMAX"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;NOMINMAX;_BIND_TO_CURRENT_CRT_VERSION"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -171,7 +171,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="$(ProjectDir)\..\common"
-				PreprocessorDefinitions="WIN32;_LIB;NOMINMAX"
+				PreprocessorDefinitions="WIN32;_LIB;NOMINMAX;_BIND_TO_CURRENT_CRT_VERSION"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
@@ -233,7 +233,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="$(ProjectDir)\..\common"
-				PreprocessorDefinitions="WIN32;_LIB;NOMINMAX"
+				PreprocessorDefinitions="WIN32;_LIB;NOMINMAX;_BIND_TO_CURRENT_CRT_VERSION"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"

Modified: trunk/oggdsf/src/lib/codecs/webm/webmdshow/libmkvparser/libmkvparser_2008.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/webm/webmdshow/libmkvparser/libmkvparser_2008.vcproj	2010-06-16 13:32:35 UTC (rev 17292)
+++ trunk/oggdsf/src/lib/codecs/webm/webmdshow/libmkvparser/libmkvparser_2008.vcproj	2010-06-16 22:32:53 UTC (rev 17293)
@@ -44,7 +44,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="$(ProjectDir)\..\common"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;NOMINMAX"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;NOMINMAX;_BIND_TO_CURRENT_CRT_VERSION"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -108,7 +108,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="$(ProjectDir)\..\common"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;NOMINMAX"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;NOMINMAX;_BIND_TO_CURRENT_CRT_VERSION"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -171,7 +171,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="$(ProjectDir)\..\common"
-				PreprocessorDefinitions="WIN32;_LIB;NOMINMAX"
+				PreprocessorDefinitions="WIN32;_LIB;NOMINMAX;_BIND_TO_CURRENT_CRT_VERSION"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
@@ -233,7 +233,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="$(ProjectDir)\..\common"
-				PreprocessorDefinitions="WIN32;_LIB;NOMINMAX"
+				PreprocessorDefinitions="WIN32;_LIB;NOMINMAX;_BIND_TO_CURRENT_CRT_VERSION"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"

Modified: trunk/oggdsf/src/lib/codecs/webm/webmdshow/vp8decoder/vp8decoder_2005.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/webm/webmdshow/vp8decoder/vp8decoder_2005.vcproj	2010-06-16 13:32:35 UTC (rev 17292)
+++ trunk/oggdsf/src/lib/codecs/webm/webmdshow/vp8decoder/vp8decoder_2005.vcproj	2010-06-16 22:32:53 UTC (rev 17293)
@@ -49,7 +49,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\common&quot;;&quot;$(ProjectDir)\..\IDL&quot;;&quot;$(ProjectDir)\..\..\libvpx\include&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;VP8DECODER_EXPORTS"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;VP8DECODER_EXPORTS;_BIND_TO_CURRENT_CRT_VERSION"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -137,7 +137,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\common&quot;;&quot;$(ProjectDir)\..\IDL&quot;;&quot;$(ProjectDir)\..\..\libvpx\include&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;VP8DECODER_EXPORTS"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;VP8DECODER_EXPORTS;_BIND_TO_CURRENT_CRT_VERSION"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -224,7 +224,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\common&quot;;&quot;$(ProjectDir)\..\IDL&quot;;&quot;$(ProjectDir)\..\..\libvpx\include&quot;"
-				PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;VP8DECODER_EXPORTS"
+				PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;VP8DECODER_EXPORTS;_BIND_TO_CURRENT_CRT_VERSION"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
@@ -247,9 +247,9 @@
 				OutputFile="$(OutDir)\$(RootNameSpace).dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(SolutionDir)vp8_sdk\lib\Win32"
-				GenerateManifest="false"
+				GenerateManifest="true"
 				ModuleDefinitionFile="vp8decoder.def"
-				GenerateDebugInformation="false"
+				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -312,7 +312,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\common&quot;;&quot;$(ProjectDir)\..\IDL&quot;;&quot;$(ProjectDir)\..\..\libvpx\include&quot;"
-				PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;VP8DECODER_EXPORTS"
+				PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;VP8DECODER_EXPORTS;_BIND_TO_CURRENT_CRT_VERSION"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
@@ -335,9 +335,9 @@
 				OutputFile="$(OutDir)\$(RootNameSpace).dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(SolutionDir)vp8_sdk\lib\Win32"
-				GenerateManifest="false"
+				GenerateManifest="true"
 				ModuleDefinitionFile="vp8decoder.def"
-				GenerateDebugInformation="false"
+				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"

Modified: trunk/oggdsf/src/lib/codecs/webm/webmdshow/vp8decoder/vp8decoder_2008.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/webm/webmdshow/vp8decoder/vp8decoder_2008.vcproj	2010-06-16 13:32:35 UTC (rev 17292)
+++ trunk/oggdsf/src/lib/codecs/webm/webmdshow/vp8decoder/vp8decoder_2008.vcproj	2010-06-16 22:32:53 UTC (rev 17293)
@@ -49,7 +49,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\common&quot;;&quot;$(ProjectDir)\..\IDL&quot;;&quot;$(ProjectDir)\..\..\libvpx\include&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;VP8DECODER_EXPORTS"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;VP8DECODER_EXPORTS;_BIND_TO_CURRENT_CRT_VERSION"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -137,7 +137,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\common&quot;;&quot;$(ProjectDir)\..\IDL&quot;;&quot;$(ProjectDir)\..\..\libvpx\include&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;VP8DECODER_EXPORTS"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;VP8DECODER_EXPORTS;_BIND_TO_CURRENT_CRT_VERSION"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -224,7 +224,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\common&quot;;&quot;$(ProjectDir)\..\IDL&quot;;&quot;$(ProjectDir)\..\..\libvpx\include&quot;"
-				PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;VP8DECODER_EXPORTS"
+				PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;VP8DECODER_EXPORTS;_BIND_TO_CURRENT_CRT_VERSION"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
@@ -247,9 +247,9 @@
 				OutputFile="$(OutDir)\$(RootNameSpace).dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(SolutionDir)vp8_sdk\lib\Win32"
-				GenerateManifest="false"
+				GenerateManifest="true"
 				ModuleDefinitionFile="vp8decoder.def"
-				GenerateDebugInformation="false"
+				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -312,7 +312,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\common&quot;;&quot;$(ProjectDir)\..\IDL&quot;;&quot;$(ProjectDir)\..\..\libvpx\include&quot;"
-				PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;VP8DECODER_EXPORTS"
+				PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;VP8DECODER_EXPORTS;_BIND_TO_CURRENT_CRT_VERSION"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
@@ -335,9 +335,9 @@
 				OutputFile="$(OutDir)\$(RootNameSpace).dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(SolutionDir)vp8_sdk\lib\Win32"
-				GenerateManifest="false"
+				GenerateManifest="true"
 				ModuleDefinitionFile="vp8decoder.def"
-				GenerateDebugInformation="false"
+				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"

Modified: trunk/oggdsf/src/lib/codecs/webm/webmdshow/vp8encoder/vp8encoder_2005.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/webm/webmdshow/vp8encoder/vp8encoder_2005.vcproj	2010-06-16 13:32:35 UTC (rev 17292)
+++ trunk/oggdsf/src/lib/codecs/webm/webmdshow/vp8encoder/vp8encoder_2005.vcproj	2010-06-16 22:32:53 UTC (rev 17293)
@@ -49,7 +49,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\common&quot;;&quot;$(ProjectDir)\..\IDL&quot;;&quot;$(ProjectDir)\..\..\libvpx\include&quot;;$(IntDir);$(ProjectDir)"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;VP8ENCODER_EXPORTS"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;VP8ENCODER_EXPORTS;_BIND_TO_CURRENT_CRT_VERSION"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -138,7 +138,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\common&quot;;&quot;$(ProjectDir)\..\IDL&quot;;&quot;$(ProjectDir)\..\..\libvpx\include&quot;;$(IntDir);$(ProjectDir)"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;VP8ENCODER_EXPORTS"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;VP8ENCODER_EXPORTS;_BIND_TO_CURRENT_CRT_VERSION"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -226,7 +226,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\common&quot;;&quot;$(ProjectDir)\..\IDL&quot;;&quot;$(ProjectDir)\..\..\libvpx\include&quot;;$(IntDir);$(ProjectDir)"
-				PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;VP8ENCODER_EXPORTS"
+				PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;VP8ENCODER_EXPORTS;_BIND_TO_CURRENT_CRT_VERSION"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
@@ -249,9 +249,9 @@
 				OutputFile="$(OutDir)\$(RootNameSpace).dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(SolutionDir)vp8_sdk\lib\Win32"
-				GenerateManifest="false"
+				GenerateManifest="true"
 				ModuleDefinitionFile="vp8encoder.def"
-				GenerateDebugInformation="false"
+				GenerateDebugInformation="true"
 				SubSystem="0"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -314,7 +314,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\common&quot;;&quot;$(ProjectDir)\..\IDL&quot;;&quot;$(ProjectDir)\..\..\libvpx\include&quot;;$(IntDir);$(ProjectDir)"
-				PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;VP8ENCODER_EXPORTS"
+				PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;VP8ENCODER_EXPORTS;_BIND_TO_CURRENT_CRT_VERSION"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
@@ -337,9 +337,9 @@
 				OutputFile="$(OutDir)\$(RootNameSpace).dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(SolutionDir)vp8_sdk\lib\Win32"
-				GenerateManifest="false"
+				GenerateManifest="true"
 				ModuleDefinitionFile="vp8encoder.def"
-				GenerateDebugInformation="false"
+				GenerateDebugInformation="true"
 				SubSystem="0"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"

Modified: trunk/oggdsf/src/lib/codecs/webm/webmdshow/vp8encoder/vp8encoder_2008.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/webm/webmdshow/vp8encoder/vp8encoder_2008.vcproj	2010-06-16 13:32:35 UTC (rev 17292)
+++ trunk/oggdsf/src/lib/codecs/webm/webmdshow/vp8encoder/vp8encoder_2008.vcproj	2010-06-16 22:32:53 UTC (rev 17293)
@@ -49,7 +49,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\common&quot;;&quot;$(ProjectDir)\..\IDL&quot;;&quot;$(ProjectDir)\..\..\libvpx\include&quot;;$(IntDir);$(ProjectDir)"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;VP8ENCODER_EXPORTS"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;VP8ENCODER_EXPORTS;_BIND_TO_CURRENT_CRT_VERSION"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -138,7 +138,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\common&quot;;&quot;$(ProjectDir)\..\IDL&quot;;&quot;$(ProjectDir)\..\..\libvpx\include&quot;;$(IntDir);$(ProjectDir)"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;VP8ENCODER_EXPORTS"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;VP8ENCODER_EXPORTS;_BIND_TO_CURRENT_CRT_VERSION"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -226,7 +226,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\common&quot;;&quot;$(ProjectDir)\..\IDL&quot;;&quot;$(ProjectDir)\..\..\libvpx\include&quot;;$(IntDir);$(ProjectDir)"
-				PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;VP8ENCODER_EXPORTS"
+				PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;VP8ENCODER_EXPORTS;_BIND_TO_CURRENT_CRT_VERSION"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
@@ -249,9 +249,9 @@
 				OutputFile="$(OutDir)\$(RootNameSpace).dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(SolutionDir)vp8_sdk\lib\Win32"
-				GenerateManifest="false"
+				GenerateManifest="true"
 				ModuleDefinitionFile="vp8encoder.def"
-				GenerateDebugInformation="false"
+				GenerateDebugInformation="true"
 				SubSystem="0"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -314,7 +314,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\common&quot;;&quot;$(ProjectDir)\..\IDL&quot;;&quot;$(ProjectDir)\..\..\libvpx\include&quot;;$(IntDir);$(ProjectDir)"
-				PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;VP8ENCODER_EXPORTS"
+				PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;VP8ENCODER_EXPORTS;_BIND_TO_CURRENT_CRT_VERSION"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
@@ -337,9 +337,9 @@
 				OutputFile="$(OutDir)\$(RootNameSpace).dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="$(SolutionDir)vp8_sdk\lib\Win32"
-				GenerateManifest="false"
+				GenerateManifest="true"
 				ModuleDefinitionFile="vp8encoder.def"
-				GenerateDebugInformation="false"
+				GenerateDebugInformation="true"
 				SubSystem="0"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"

Modified: trunk/oggdsf/src/lib/codecs/webm/webmdshow/webmmux/webmmux_2005.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/webm/webmdshow/webmmux/webmmux_2005.vcproj	2010-06-16 13:32:35 UTC (rev 17292)
+++ trunk/oggdsf/src/lib/codecs/webm/webmdshow/webmmux/webmmux_2005.vcproj	2010-06-16 22:32:53 UTC (rev 17293)
@@ -44,7 +44,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\common&quot;;&quot;$(ProjectDir)\..\libmkvparser&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_WIN32_WINNT=0x0400;NOMINMAX"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_WIN32_WINNT=0x0400;NOMINMAX;_BIND_TO_CURRENT_CRT_VERSION"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -126,7 +126,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\common&quot;;&quot;$(ProjectDir)\..\libmkvparser&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_WIN32_WINNT=0x0400;NOMINMAX"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_WIN32_WINNT=0x0400;NOMINMAX;_BIND_TO_CURRENT_CRT_VERSION"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -207,7 +207,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\common&quot;;&quot;$(ProjectDir)\..\libmkvparser&quot;"
-				PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;NOMINMAX;_WIN32_WINNT=0x0400;NOMINMAX"
+				PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;NOMINMAX;_WIN32_WINNT=0x0400;NOMINMAX;_BIND_TO_CURRENT_CRT_VERSION"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
@@ -228,9 +228,9 @@
 				AdditionalDependencies="strmiids.lib"
 				OutputFile="$(OutDir)\$(RootNameSpace).dll"
 				LinkIncremental="1"
-				GenerateManifest="false"
+				GenerateManifest="true"
 				ModuleDefinitionFile="webmmux.def"
-				GenerateDebugInformation="false"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
 				SubSystem="0"
 				OptimizeReferences="2"
@@ -289,7 +289,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\common&quot;;&quot;$(ProjectDir)\..\libmkvparser&quot;"
-				PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;NOMINMAX;_WIN32_WINNT=0x0400;NOMINMAX"
+				PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;NOMINMAX;_WIN32_WINNT=0x0400;NOMINMAX;_BIND_TO_CURRENT_CRT_VERSION"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
@@ -310,9 +310,9 @@
 				AdditionalDependencies="strmiids.lib"
 				OutputFile="$(OutDir)\$(RootNameSpace).dll"
 				LinkIncremental="1"
-				GenerateManifest="false"
+				GenerateManifest="true"
 				ModuleDefinitionFile="webmmux.def"
-				GenerateDebugInformation="false"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
 				SubSystem="0"
 				OptimizeReferences="2"

Modified: trunk/oggdsf/src/lib/codecs/webm/webmdshow/webmmux/webmmux_2008.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/webm/webmdshow/webmmux/webmmux_2008.vcproj	2010-06-16 13:32:35 UTC (rev 17292)
+++ trunk/oggdsf/src/lib/codecs/webm/webmdshow/webmmux/webmmux_2008.vcproj	2010-06-16 22:32:53 UTC (rev 17293)
@@ -44,7 +44,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\common&quot;;&quot;$(ProjectDir)\..\libmkvparser&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_WIN32_WINNT=0x0400;NOMINMAX"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_WIN32_WINNT=0x0400;NOMINMAX;_BIND_TO_CURRENT_CRT_VERSION"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -126,7 +126,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\common&quot;;&quot;$(ProjectDir)\..\libmkvparser&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_WIN32_WINNT=0x0400;NOMINMAX"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_WIN32_WINNT=0x0400;NOMINMAX;_BIND_TO_CURRENT_CRT_VERSION"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -207,7 +207,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\common&quot;;&quot;$(ProjectDir)\..\libmkvparser&quot;"
-				PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;NOMINMAX;_WIN32_WINNT=0x0400;NOMINMAX"
+				PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;NOMINMAX;_WIN32_WINNT=0x0400;NOMINMAX;_BIND_TO_CURRENT_CRT_VERSION"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
@@ -228,9 +228,9 @@
 				AdditionalDependencies="strmiids.lib"
 				OutputFile="$(OutDir)\$(RootNameSpace).dll"
 				LinkIncremental="1"
-				GenerateManifest="false"
+				GenerateManifest="true"
 				ModuleDefinitionFile="webmmux.def"
-				GenerateDebugInformation="false"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
 				SubSystem="0"
 				OptimizeReferences="2"
@@ -289,7 +289,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\common&quot;;&quot;$(ProjectDir)\..\libmkvparser&quot;"
-				PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;NOMINMAX;_WIN32_WINNT=0x0400;NOMINMAX"
+				PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;NOMINMAX;_WIN32_WINNT=0x0400;NOMINMAX;_BIND_TO_CURRENT_CRT_VERSION"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
@@ -310,9 +310,9 @@
 				AdditionalDependencies="strmiids.lib"
 				OutputFile="$(OutDir)\$(RootNameSpace).dll"
 				LinkIncremental="1"
-				GenerateManifest="false"
+				GenerateManifest="true"
 				ModuleDefinitionFile="webmmux.def"
-				GenerateDebugInformation="false"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
 				SubSystem="0"
 				OptimizeReferences="2"

Modified: trunk/oggdsf/src/lib/codecs/webm/webmdshow/webmsplit/webmsplit_2005.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/webm/webmdshow/webmsplit/webmsplit_2005.vcproj	2010-06-16 13:32:35 UTC (rev 17292)
+++ trunk/oggdsf/src/lib/codecs/webm/webmdshow/webmsplit/webmsplit_2005.vcproj	2010-06-16 22:32:53 UTC (rev 17293)
@@ -44,7 +44,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\common&quot;;&quot;$(ProjectDir)\..\libmkvparser&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_WIN32_WINNT=0x0400;NOMINMAX"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_WIN32_WINNT=0x0400;NOMINMAX;_BIND_TO_CURRENT_CRT_VERSION"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -125,7 +125,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\common&quot;;&quot;$(ProjectDir)\..\libmkvparser&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_WIN32_WINNT=0x0400;NOMINMAX"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_WIN32_WINNT=0x0400;NOMINMAX;_BIND_TO_CURRENT_CRT_VERSION"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -205,7 +205,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\common&quot;;&quot;$(ProjectDir)\..\libmkvparser&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_WIN32_WINNT=0x0400;NOMINMAX"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_WIN32_WINNT=0x0400;NOMINMAX;_BIND_TO_CURRENT_CRT_VERSION"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
@@ -226,9 +226,9 @@
 				AdditionalDependencies="strmiids.lib"
 				OutputFile="$(OutDir)\$(RootNameSpace).dll"
 				LinkIncremental="1"
-				GenerateManifest="false"
+				GenerateManifest="true"
 				ModuleDefinitionFile="webmsplit.def"
-				GenerateDebugInformation="false"
+				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -286,7 +286,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\common&quot;;&quot;$(ProjectDir)\..\libmkvparser&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_WIN32_WINNT=0x0400;NOMINMAX"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_WIN32_WINNT=0x0400;NOMINMAX;_BIND_TO_CURRENT_CRT_VERSION"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
@@ -307,9 +307,9 @@
 				AdditionalDependencies="strmiids.lib"
 				OutputFile="$(OutDir)\$(RootNameSpace).dll"
 				LinkIncremental="1"
-				GenerateManifest="false"
+				GenerateManifest="true"
 				ModuleDefinitionFile="webmsplit.def"
-				GenerateDebugInformation="false"
+				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"

Modified: trunk/oggdsf/src/lib/codecs/webm/webmdshow/webmsplit/webmsplit_2008.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/webm/webmdshow/webmsplit/webmsplit_2008.vcproj	2010-06-16 13:32:35 UTC (rev 17292)
+++ trunk/oggdsf/src/lib/codecs/webm/webmdshow/webmsplit/webmsplit_2008.vcproj	2010-06-16 22:32:53 UTC (rev 17293)
@@ -44,7 +44,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\common&quot;;&quot;$(ProjectDir)\..\libmkvparser&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_WIN32_WINNT=0x0400;NOMINMAX"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_WIN32_WINNT=0x0400;NOMINMAX;_BIND_TO_CURRENT_CRT_VERSION"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -125,7 +125,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\common&quot;;&quot;$(ProjectDir)\..\libmkvparser&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_WIN32_WINNT=0x0400;NOMINMAX"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_WIN32_WINNT=0x0400;NOMINMAX;_BIND_TO_CURRENT_CRT_VERSION"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -205,7 +205,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\common&quot;;&quot;$(ProjectDir)\..\libmkvparser&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_WIN32_WINNT=0x0400;NOMINMAX"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_WIN32_WINNT=0x0400;NOMINMAX;_BIND_TO_CURRENT_CRT_VERSION"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
@@ -226,9 +226,9 @@
 				AdditionalDependencies="strmiids.lib"
 				OutputFile="$(OutDir)\$(RootNameSpace).dll"
 				LinkIncremental="1"
-				GenerateManifest="false"
+				GenerateManifest="true"
 				ModuleDefinitionFile="webmsplit.def"
-				GenerateDebugInformation="false"
+				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -286,7 +286,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="&quot;$(ProjectDir)\..\common&quot;;&quot;$(ProjectDir)\..\libmkvparser&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_WIN32_WINNT=0x0400;NOMINMAX"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_WIN32_WINNT=0x0400;NOMINMAX;_BIND_TO_CURRENT_CRT_VERSION"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
@@ -307,9 +307,9 @@
 				AdditionalDependencies="strmiids.lib"
 				OutputFile="$(OutDir)\$(RootNameSpace).dll"
 				LinkIncremental="1"
-				GenerateManifest="false"
+				GenerateManifest="true"
 				ModuleDefinitionFile="webmsplit.def"
-				GenerateDebugInformation="false"
+				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"

Deleted: trunk/oggdsf/src/tests/testVideoImageGrab/testVideoImageGrab.csproj.user
===================================================================
--- trunk/oggdsf/src/tests/testVideoImageGrab/testVideoImageGrab.csproj.user	2010-06-16 13:32:35 UTC (rev 17292)
+++ trunk/oggdsf/src/tests/testVideoImageGrab/testVideoImageGrab.csproj.user	2010-06-16 22:32:53 UTC (rev 17293)
@@ -1,64 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <LastOpenVersion>7.10.3077</LastOpenVersion>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ReferencePath>
-    </ReferencePath>
-    <CopyProjectDestinationFolder>
-    </CopyProjectDestinationFolder>
-    <CopyProjectUncPath>
-    </CopyProjectUncPath>
-    <CopyProjectOption>0</CopyProjectOption>
-    <ProjectView>ProjectFiles</ProjectView>
-    <ProjectTrust>0</ProjectTrust>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <EnableASPDebugging>false</EnableASPDebugging>
-    <EnableASPXDebugging>false</EnableASPXDebugging>
-    <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
-    <EnableSQLServerDebugging>false</EnableSQLServerDebugging>
-    <RemoteDebugEnabled>false</RemoteDebugEnabled>
-    <RemoteDebugMachine>
-    </RemoteDebugMachine>
-    <StartAction>Project</StartAction>
-    <StartArguments>
-    </StartArguments>
-    <StartPage>
-    </StartPage>
-    <StartProgram>
-    </StartProgram>
-    <StartURL>
-    </StartURL>
-    <StartWorkingDirectory>
-    </StartWorkingDirectory>
-    <StartWithIE>true</StartWithIE>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <EnableASPDebugging>false</EnableASPDebugging>
-    <EnableASPXDebugging>false</EnableASPXDebugging>
-    <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
-    <EnableSQLServerDebugging>false</EnableSQLServerDebugging>
-    <RemoteDebugEnabled>false</RemoteDebugEnabled>
-    <RemoteDebugMachine>
-    </RemoteDebugMachine>
-    <StartAction>Project</StartAction>
-    <StartArguments>
-    </StartArguments>
-    <StartPage>
-    </StartPage>
-    <StartProgram>
-    </StartProgram>
-    <StartURL>
-    </StartURL>
-    <StartWorkingDirectory>
-    </StartWorkingDirectory>
-    <StartWithIE>true</StartWithIE>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_CE_ARM|AnyCPU' ">
-    <StartWithIE>true</StartWithIE>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_WM5_PPC_ARM|AnyCPU' ">
-    <StartWithIE>true</StartWithIE>
-  </PropertyGroup>
-</Project>
\ No newline at end of file

Deleted: trunk/oggdsf/src/tools/DNPlay/DNPlay.csproj.user
===================================================================
--- trunk/oggdsf/src/tools/DNPlay/DNPlay.csproj.user	2010-06-16 13:32:35 UTC (rev 17292)
+++ trunk/oggdsf/src/tools/DNPlay/DNPlay.csproj.user	2010-06-16 22:32:53 UTC (rev 17293)
@@ -1,58 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <LastOpenVersion>7.10.3077</LastOpenVersion>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ReferencePath>
-    </ReferencePath>
-    <CopyProjectDestinationFolder>
-    </CopyProjectDestinationFolder>
-    <CopyProjectUncPath>
-    </CopyProjectUncPath>
-    <CopyProjectOption>0</CopyProjectOption>
-    <ProjectView>ProjectFiles</ProjectView>
-    <ProjectTrust>0</ProjectTrust>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <EnableASPDebugging>false</EnableASPDebugging>
-    <EnableASPXDebugging>false</EnableASPXDebugging>
-    <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
-    <EnableSQLServerDebugging>false</EnableSQLServerDebugging>
-    <RemoteDebugEnabled>false</RemoteDebugEnabled>
-    <RemoteDebugMachine>
-    </RemoteDebugMachine>
-    <StartAction>Project</StartAction>
-    <StartArguments>
-    </StartArguments>
-    <StartPage>
-    </StartPage>
-    <StartProgram>
-    </StartProgram>
-    <StartURL>
-    </StartURL>
-    <StartWorkingDirectory>
-    </StartWorkingDirectory>
-    <StartWithIE>false</StartWithIE>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <EnableASPDebugging>false</EnableASPDebugging>
-    <EnableASPXDebugging>false</EnableASPXDebugging>
-    <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
-    <EnableSQLServerDebugging>false</EnableSQLServerDebugging>
-    <RemoteDebugEnabled>false</RemoteDebugEnabled>
-    <RemoteDebugMachine>
-    </RemoteDebugMachine>
-    <StartAction>Project</StartAction>
-    <StartArguments>
-    </StartArguments>
-    <StartPage>
-    </StartPage>
-    <StartProgram>
-    </StartProgram>
-    <StartURL>
-    </StartURL>
-    <StartWorkingDirectory>
-    </StartWorkingDirectory>
-    <StartWithIE>false</StartWithIE>
-  </PropertyGroup>
-</Project>
\ No newline at end of file

Deleted: trunk/oggdsf/src/tools/iOCE/iOCE.csproj.user
===================================================================
--- trunk/oggdsf/src/tools/iOCE/iOCE.csproj.user	2010-06-16 13:32:35 UTC (rev 17292)
+++ trunk/oggdsf/src/tools/iOCE/iOCE.csproj.user	2010-06-16 22:32:53 UTC (rev 17293)
@@ -1,64 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <LastOpenVersion>7.10.3077</LastOpenVersion>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ReferencePath>
-    </ReferencePath>
-    <CopyProjectDestinationFolder>
-    </CopyProjectDestinationFolder>
-    <CopyProjectUncPath>
-    </CopyProjectUncPath>
-    <CopyProjectOption>0</CopyProjectOption>
-    <ProjectView>ProjectFiles</ProjectView>
-    <ProjectTrust>0</ProjectTrust>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <EnableASPDebugging>false</EnableASPDebugging>
-    <EnableASPXDebugging>false</EnableASPXDebugging>
-    <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
-    <EnableSQLServerDebugging>false</EnableSQLServerDebugging>
-    <RemoteDebugEnabled>false</RemoteDebugEnabled>
-    <RemoteDebugMachine>
-    </RemoteDebugMachine>
-    <StartAction>Project</StartAction>
-    <StartArguments>
-    </StartArguments>
-    <StartPage>
-    </StartPage>
-    <StartProgram>
-    </StartProgram>
-    <StartURL>
-    </StartURL>
-    <StartWorkingDirectory>
-    </StartWorkingDirectory>
-    <StartWithIE>true</StartWithIE>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <EnableASPDebugging>false</EnableASPDebugging>
-    <EnableASPXDebugging>false</EnableASPXDebugging>
-    <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
-    <EnableSQLServerDebugging>false</EnableSQLServerDebugging>
-    <RemoteDebugEnabled>false</RemoteDebugEnabled>
-    <RemoteDebugMachine>
-    </RemoteDebugMachine>
-    <StartAction>Project</StartAction>
-    <StartArguments>
-    </StartArguments>
-    <StartPage>
-    </StartPage>
-    <StartProgram>
-    </StartProgram>
-    <StartURL>
-    </StartURL>
-    <StartWorkingDirectory>
-    </StartWorkingDirectory>
-    <StartWithIE>true</StartWithIE>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_CE_ARM|AnyCPU' ">
-    <StartWithIE>true</StartWithIE>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_WM5_PPC_ARM|AnyCPU' ">
-    <StartWithIE>true</StartWithIE>
-  </PropertyGroup>
-</Project>
\ No newline at end of file



More information about the commits mailing list