--- branches/dev-api-4/xvidcore/build/win32/libxvidcore.dsp	2003/03/25 11:01:48	942
+++ branches/dev-api-4/xvidcore/build/win32/libxvidcore.dsp	2003/09/11 12:33:12	1143
@@ -25,7 +25,7 @@
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=cl.exe
+CPP=xicl6.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "libxvidcore - Win32 Release"
@@ -41,7 +41,8 @@
 # PROP Intermediate_Dir "Release"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /Ob2 /D "NDEBUG" /D "ARCH_IS_IA32" /D "ARCH_IS_32BIT" /D "ARCH_IS_LITTLE_ENDIAN" /D "WIN32" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /G6 /W3 /GX /Op /Ob2 /D "NDEBUG" /D "ARCH_IS_IA32" /D "ARCH_IS_32BIT" /D "ARCH_IS_LITTLE_ENDIAN" /D "WIN32" /D "_MBCS" /D "_LIB" /FAcs /YX /FD /O3 -QxK /Qunroll /c
+# SUBTRACT CPP /Z<none> /Fr
 # ADD BASE RSC /l 0xc09 /d "NDEBUG"
 # ADD RSC /l 0xc09 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -64,7 +65,7 @@
 # PROP Intermediate_Dir "Debug"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "_DEBUG" /D "ARCH_IS_IA32" /D "ARCH_IS_32BIT" /D "ARCH_IS_LITTLE_ENDIAN" /D "WIN32" /D "_MBCS" /D "_LIB" /FR /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /D "_DEBUG" /D "ARCH_IS_IA32" /D "ARCH_IS_32BIT" /D "ARCH_IS_LITTLE_ENDIAN" /D "WIN32" /D "_MBCS" /D "_LIB" /FR /YX /FD /GZ /c
 # ADD BASE RSC /l 0xc09 /d "_DEBUG"
 # ADD RSC /l 0xc09 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -469,7 +470,7 @@
 !IF  "$(CFG)" == "libxvidcore - Win32 Release"
 
 # Begin Custom Build - Assembling $(InputPath)
-InputDir=\xvid\stable4\src\image\x86_asm
+InputDir=\^^^dev-api-4\!!\xvidcore\src\image\x86_asm
 IntDir=.\Release
 InputPath=..\..\src\image\x86_asm\colorspace_rgb_mmx.asm
 InputName=colorspace_rgb_mmx
@@ -482,7 +483,7 @@
 !ELSEIF  "$(CFG)" == "libxvidcore - Win32 Debug"
 
 # Begin Custom Build - Assembling $(InputPath)
-InputDir=\xvid\stable4\src\image\x86_asm
+InputDir=\^^^dev-api-4\!!\xvidcore\src\image\x86_asm
 IntDir=.\Debug
 InputPath=..\..\src\image\x86_asm\colorspace_rgb_mmx.asm
 InputName=colorspace_rgb_mmx
@@ -502,7 +503,7 @@
 !IF  "$(CFG)" == "libxvidcore - Win32 Release"
 
 # Begin Custom Build - Assembling $(InputPath)
-InputDir=\xvid\stable4\src\image\x86_asm
+InputDir=\^^^dev-api-4\!!\xvidcore\src\image\x86_asm
 IntDir=.\Release
 InputPath=..\..\src\image\x86_asm\colorspace_yuv_mmx.asm
 InputName=colorspace_yuv_mmx
@@ -515,7 +516,7 @@
 !ELSEIF  "$(CFG)" == "libxvidcore - Win32 Debug"
 
 # Begin Custom Build - Assembling $(InputPath)
-InputDir=\xvid\stable4\src\image\x86_asm
+InputDir=\^^^dev-api-4\!!\xvidcore\src\image\x86_asm
 IntDir=.\Debug
 InputPath=..\..\src\image\x86_asm\colorspace_yuv_mmx.asm
 InputName=colorspace_yuv_mmx
@@ -535,7 +536,7 @@
 !IF  "$(CFG)" == "libxvidcore - Win32 Release"
 
 # Begin Custom Build - Assembling $(InputPath)
-InputDir=\xvid\stable4\src\image\x86_asm
+InputDir=\^^^dev-api-4\!!\xvidcore\src\image\x86_asm
 IntDir=.\Release
 InputPath=..\..\src\image\x86_asm\colorspace_yuyv_mmx.asm
 InputName=colorspace_yuyv_mmx
@@ -548,7 +549,7 @@
 !ELSEIF  "$(CFG)" == "libxvidcore - Win32 Debug"
 
 # Begin Custom Build - Assembling $(InputPath)
-InputDir=\xvid\stable4\src\image\x86_asm
+InputDir=\^^^dev-api-4\!!\xvidcore\src\image\x86_asm
 IntDir=.\Debug
 InputPath=..\..\src\image\x86_asm\colorspace_yuyv_mmx.asm
 InputName=colorspace_yuyv_mmx
@@ -687,6 +688,27 @@
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\image\x86_asm\qpel_mmx.asm
+
+!IF  "$(CFG)" == "libxvidcore - Win32 Release"
+
+# Begin Custom Build
+IntDir=.\Release
+InputPath=..\..\src\image\x86_asm\qpel_mmx.asm
+InputName=qpel_mmx
+
+"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "libxvidcore - Win32 Debug"
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\image\x86_asm\reduced_mmx.asm
 
 !IF  "$(CFG)" == "libxvidcore - Win32 Release"
@@ -759,6 +781,10 @@
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\image\qpel.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\image\reduced.c
 # End Source File
 # End Group
@@ -930,28 +956,52 @@
 # PROP Default_Filter ""
 # Begin Source File
 
+SOURCE=..\..\src\motion\estimation.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\motion\gmc.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\motion\motion.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\motion\motion_est.h
+SOURCE=..\..\src\motion\motion_inlines.h
 # End Source File
 # Begin Source File
 
 SOURCE=..\..\src\motion\sad.h
 # End Source File
+# End Group
 # Begin Source File
 
-SOURCE=..\..\src\motion\smp_motion_est.h
+SOURCE=..\..\src\motion\estimation_bvop.c
 # End Source File
-# End Group
 # Begin Source File
 
-SOURCE=..\..\src\motion\motion_comp.c
+SOURCE=..\..\src\motion\estimation_common.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\motion\motion_est.c
+SOURCE=..\..\src\motion\estimation_gmc.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\motion\estimation_pvop.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\motion\estimation_rd_based.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\motion\gmc.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\motion\motion_comp.c
 # End Source File
 # Begin Source File
 
@@ -959,7 +1009,7 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\motion\smp_motion_est.c
+SOURCE=..\..\src\motion\vop_type_decision.c
 # End Source File
 # End Group
 # Begin Group "prediction"
@@ -1114,10 +1164,6 @@
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\src\quant\adapt_quant.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\src\quant\quant_h263.h
 # End Source File
 # Begin Source File
@@ -1131,10 +1177,6 @@
 # End Group
 # Begin Source File
 
-SOURCE=..\..\src\quant\adapt_quant.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\src\quant\quant_h263.c
 # End Source File
 # Begin Source File
@@ -1323,10 +1365,6 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\utils\ratecontrol.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\src\utils\timer.c
 # End Source File
 # End Group
@@ -1371,23 +1409,19 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\plugins\plugin_cbr.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\src\plugins\plugin_dump.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\plugins\plugin_fixed.c
+SOURCE=..\..\src\plugins\plugin_lumimasking.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\plugins\plugin_lumimasking.c
+SOURCE=..\..\src\plugins\plugin_psnr.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\plugins\plugin_psnr.c
+SOURCE=..\..\src\plugins\plugin_single.c
 # End Source File
 # End Group
 # Begin Source File