--- branches/dev-api-4/xvidcore/build/win32/libxvidcore.dsp	2003/06/10 10:10:45	1062
+++ branches/dev-api-4/xvidcore/build/win32/libxvidcore.dsp	2003/10/27 01:03:06	1190
@@ -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
@@ -273,13 +274,13 @@
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\src\dct\x86_asm\fdct_mmx.asm
+SOURCE=..\..\src\dct\x86_asm\fdct_mmx_ffmpeg.asm
 
 !IF  "$(CFG)" == "libxvidcore - Win32 Release"
 
 # Begin Custom Build - Assembling $(InputPath)
 IntDir=.\Release
-InputPath=..\..\src\dct\x86_asm\fdct_mmx.asm
+InputPath=..\..\src\dct\x86_asm\fdct_mmx_ffmpeg.asm
 InputName=fdct_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
@@ -291,7 +292,7 @@
 
 # Begin Custom Build - Assembling $(InputPath)
 IntDir=.\Debug
-InputPath=..\..\src\dct\x86_asm\fdct_mmx.asm
+InputPath=..\..\src\dct\x86_asm\fdct_mmx_ffmpeg.asm
 InputName=fdct_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
@@ -304,13 +305,13 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\dct\x86_asm\fdct_xmm.asm
+SOURCE=..\..\src\dct\x86_asm\fdct_mmx_skal.asm
 
 !IF  "$(CFG)" == "libxvidcore - Win32 Release"
 
 # Begin Custom Build - Assembling $(InputPath)
 IntDir=.\Release
-InputPath=..\..\src\dct\x86_asm\fdct_xmm.asm
+InputPath=..\..\src\dct\x86_asm\fdct_mmx_skal.asm
 InputName=fdct_xmm
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
@@ -322,7 +323,7 @@
 
 # Begin Custom Build - Assembling $(InputPath)
 IntDir=.\Debug
-InputPath=..\..\src\dct\x86_asm\fdct_xmm.asm
+InputPath=..\..\src\dct\x86_asm\fdct_mmx_skal.asm
 InputName=fdct_xmm
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
@@ -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\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\motion_est.c
+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"
@@ -986,14 +1036,14 @@
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\src\quant\x86_asm\quantize4_mmx.asm
+SOURCE=..\..\src\quant\x86_asm\quantize_mpeg_mmx.asm
 
 !IF  "$(CFG)" == "libxvidcore - Win32 Release"
 
 # Begin Custom Build - Assembling $(InputPath)
 IntDir=.\Release
-InputPath=..\..\src\quant\x86_asm\quantize4_mmx.asm
-InputName=quantize4_mmx
+InputPath=..\..\src\quant\x86_asm\quantize_mpeg_mmx.asm
+InputName=quantize_mpeg_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
@@ -1004,8 +1054,8 @@
 
 # Begin Custom Build - Assembling $(InputPath)
 IntDir=.\Debug
-InputPath=..\..\src\quant\x86_asm\quantize4_mmx.asm
-InputName=quantize4_mmx
+InputPath=..\..\src\quant\x86_asm\quantize_mpeg_mmx.asm
+InputName=quantize_mpeg_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
@@ -1017,14 +1067,14 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\quant\x86_asm\quantize4_xmm.asm
+SOURCE=..\..\src\quant\x86_asm\quantize_mpeg_xmm.asm
 
 !IF  "$(CFG)" == "libxvidcore - Win32 Release"
 
 # Begin Custom Build - Assembling $(InputPath)
 IntDir=.\Release
-InputPath=..\..\src\quant\x86_asm\quantize4_xmm.asm
-InputName=quantize4_xmm
+InputPath=..\..\src\quant\x86_asm\quantize_mpeg_xmm.asm
+InputName=quantize_mpeg_xmm
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
@@ -1035,8 +1085,8 @@
 
 # Begin Custom Build - Assembling $(InputPath)
 IntDir=.\Debug
-InputPath=..\..\src\quant\x86_asm\quantize4_xmm.asm
-InputName=quantize4_xmm
+InputPath=..\..\src\quant\x86_asm\quantize_mpeg_xmm.asm
+InputName=quantize_mpeg_xmm
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
@@ -1048,14 +1098,14 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\quant\x86_asm\quantize_3dne.asm
+SOURCE=..\..\src\quant\x86_asm\quantize_h263_3dne.asm
 
 !IF  "$(CFG)" == "libxvidcore - Win32 Release"
 
 # Begin Custom Build - Assembling $(InputPath)
 IntDir=.\Release
-InputPath=..\..\src\quant\x86_asm\quantize_3dne.asm
-InputName=quantize_3dne
+InputPath=..\..\src\quant\x86_asm\quantize_h263_3dne.asm
+InputName=quantize_h263_3dne
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
@@ -1066,8 +1116,8 @@
 
 # Begin Custom Build - Assembling $(InputPath)
 IntDir=.\Debug
-InputPath=..\..\src\quant\x86_asm\quantize_3dne.asm
-InputName=quantize_3dne
+InputPath=..\..\src\quant\x86_asm\quantize_h263_3dne.asm
+InputName=quantize_h263_3dne
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
@@ -1079,14 +1129,14 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\quant\x86_asm\quantize_mmx.asm
+SOURCE=..\..\src\quant\x86_asm\quantize_h263_mmx.asm
 
 !IF  "$(CFG)" == "libxvidcore - Win32 Release"
 
 # Begin Custom Build - Assembling $(InputPath)
 IntDir=.\Release
-InputPath=..\..\src\quant\x86_asm\quantize_mmx.asm
-InputName=quantize_mmx
+InputPath=..\..\src\quant\x86_asm\quantize_h263_mmx.asm
+InputName=quantize_h263_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
@@ -1097,8 +1147,8 @@
 
 # Begin Custom Build - Assembling $(InputPath)
 IntDir=.\Debug
-InputPath=..\..\src\quant\x86_asm\quantize_mmx.asm
-InputName=quantize_mmx
+InputPath=..\..\src\quant\x86_asm\quantize_h263_mmx.asm
+InputName=quantize_h263_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
@@ -1114,16 +1164,12 @@
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\src\quant\quant_h263.h
+SOURCE=..\..\src\quant\quant.h
 # End Source File
 # Begin Source File
 
 SOURCE=..\..\src\quant\quant_matrix.h
 # End Source File
-# Begin Source File
-
-SOURCE=..\..\src\quant\quant_mpeg4.h
-# End Source File
 # End Group
 # Begin Source File
 
@@ -1135,7 +1181,7 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\quant\quant_mpeg4.c
+SOURCE=..\..\src\quant\quant_mpeg.c
 # End Source File
 # End Group
 # Begin Group "utils"