--- branches/dev-api-3/xvidcore/build/win32/core.dsp	2002/11/06 21:05:30	630
+++ branches/dev-api-3/xvidcore/build/win32/core.dsp	2002/11/07 10:31:03	631
@@ -377,272 +377,123 @@
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\src\image\x86_asm\interpolate8x8_3dn.asm
-
-!IF  "$(CFG)" == "core - Win32 Release"
-
-# Begin Custom Build - Assembling $(InputPath)
-IntDir=.\Release
-InputPath=..\..\src\image\x86_asm\interpolate8x8_3dn.asm
-InputName=interpolate8x8_3dn
-
-"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
-
-# Begin Custom Build - Assembling $(InputPath)
-IntDir=.\Debug
-InputPath=..\..\src\image\x86_asm\interpolate8x8_3dn.asm
-InputName=interpolate8x8_3dn
-
-"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release _SMP"
-
-# Begin Custom Build - Assembling $(InputPath)
-IntDir=.\Release_SMP
-InputPath=..\..\src\image\x86_asm\interpolate8x8_3dn.asm
-InputName=interpolate8x8_3dn
-
-"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
-
-# End Custom Build
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\image\x86_asm\interpolate8x8_mmx.asm
-
-!IF  "$(CFG)" == "core - Win32 Release"
-
-# Begin Custom Build - Assembling $(InputPath)
-IntDir=.\Release
-InputPath=..\..\src\image\x86_asm\interpolate8x8_mmx.asm
-InputName=interpolate8x8_mmx
-
-"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
-
-# Begin Custom Build - Assembling $(InputPath)
-IntDir=.\Debug
-InputPath=..\..\src\image\x86_asm\interpolate8x8_mmx.asm
-InputName=interpolate8x8_mmx
-
-"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release _SMP"
-
-# Begin Custom Build - Assembling $(InputPath)
-IntDir=.\Release_SMP
-InputPath=..\..\src\image\x86_asm\interpolate8x8_mmx.asm
-InputName=interpolate8x8_mmx
-
-"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
-
-# End Custom Build
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\image\x86_asm\interpolate8x8_xmm.asm
-
-!IF  "$(CFG)" == "core - Win32 Release"
-
-# Begin Custom Build - Assembling $(InputPath)
-IntDir=.\Release
-InputPath=..\..\src\image\x86_asm\interpolate8x8_xmm.asm
-InputName=interpolate8x8_xmm
-
-"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
-
-# Begin Custom Build - Assembling $(InputPath)
-IntDir=.\Debug
-InputPath=..\..\src\image\x86_asm\interpolate8x8_xmm.asm
-InputName=interpolate8x8_xmm
-
-"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release _SMP"
-
-# Begin Custom Build - Assembling $(InputPath)
-IntDir=.\Release_SMP
-InputPath=..\..\src\image\x86_asm\interpolate8x8_xmm.asm
-InputName=interpolate8x8_xmm
-
-"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
-
-# End Custom Build
-
-!ENDIF 
-
+SOURCE=..\..\src\image\x86_asm\colorspace_mmx.inc
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\image\x86_asm\rgb_to_yv12_mmx.asm
+SOURCE=..\..\src\image\x86_asm\colorspace_rgb_mmx.asm
 
 !IF  "$(CFG)" == "core - Win32 Release"
 
 # Begin Custom Build - Assembling $(InputPath)
+InputDir=\xvid-dev\xvidcore\src\image\x86_asm
 IntDir=.\Release
-InputPath=..\..\src\image\x86_asm\rgb_to_yv12_mmx.asm
-InputName=rgb_to_yv12_mmx
+InputPath=..\..\src\image\x86_asm\colorspace_rgb_mmx.asm
+InputName=colorspace_rgb_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -f win32 -DPREFIX -I$(InputDir) -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # Begin Custom Build - Assembling $(InputPath)
+InputDir=\xvid-dev\xvidcore\src\image\x86_asm
 IntDir=.\Debug
-InputPath=..\..\src\image\x86_asm\rgb_to_yv12_mmx.asm
-InputName=rgb_to_yv12_mmx
+InputPath=..\..\src\image\x86_asm\colorspace_rgb_mmx.asm
+InputName=colorspace_rgb_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -f win32 -DPREFIX -I$(InputDir) -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "core - Win32 Release _SMP"
 
-# Begin Custom Build - Assembling $(InputPath)
-IntDir=.\Release_SMP
-InputPath=..\..\src\image\x86_asm\rgb_to_yv12_mmx.asm
-InputName=rgb_to_yv12_mmx
-
-"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
-
-# End Custom Build
-
 !ENDIF 
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\image\x86_asm\yuv_to_yv12_mmx.asm
+SOURCE=..\..\src\image\x86_asm\colorspace_yuv_mmx.asm
 
 !IF  "$(CFG)" == "core - Win32 Release"
 
 # Begin Custom Build - Assembling $(InputPath)
+InputDir=\xvid-dev\xvidcore\src\image\x86_asm
 IntDir=.\Release
-InputPath=..\..\src\image\x86_asm\yuv_to_yv12_mmx.asm
-InputName=yuv_to_yv12_mmx
+InputPath=..\..\src\image\x86_asm\colorspace_yuv_mmx.asm
+InputName=colorspace_yuv_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -f win32 -DPREFIX -I$(InputDir) -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # Begin Custom Build - Assembling $(InputPath)
+InputDir=\xvid-dev\xvidcore\src\image\x86_asm
 IntDir=.\Debug
-InputPath=..\..\src\image\x86_asm\yuv_to_yv12_mmx.asm
-InputName=yuv_to_yv12_mmx
+InputPath=..\..\src\image\x86_asm\colorspace_yuv_mmx.asm
+InputName=colorspace_yuv_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -f win32 -DPREFIX -I$(InputDir) -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "core - Win32 Release _SMP"
 
-# Begin Custom Build - Assembling $(InputPath)
-IntDir=.\Release_SMP
-InputPath=..\..\src\image\x86_asm\yuv_to_yv12_mmx.asm
-InputName=yuv_to_yv12_mmx
-
-"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
-
-# End Custom Build
-
 !ENDIF 
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\image\x86_asm\yuyv_to_yv12_mmx.asm
+SOURCE=..\..\src\image\x86_asm\colorspace_yuyv_mmx.asm
 
 !IF  "$(CFG)" == "core - Win32 Release"
 
 # Begin Custom Build - Assembling $(InputPath)
+InputDir=\xvid-dev\xvidcore\src\image\x86_asm
 IntDir=.\Release
-InputPath=..\..\src\image\x86_asm\yuyv_to_yv12_mmx.asm
-InputName=yuyv_to_yv12_mmx
+InputPath=..\..\src\image\x86_asm\colorspace_yuyv_mmx.asm
+InputName=colorspace_yuyv_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -f win32 -DPREFIX -I$(InputDir) -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "core - Win32 Debug"
 
 # Begin Custom Build - Assembling $(InputPath)
+InputDir=\xvid-dev\xvidcore\src\image\x86_asm
 IntDir=.\Debug
-InputPath=..\..\src\image\x86_asm\yuyv_to_yv12_mmx.asm
-InputName=yuyv_to_yv12_mmx
+InputPath=..\..\src\image\x86_asm\colorspace_yuyv_mmx.asm
+InputName=colorspace_yuyv_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -f win32 -DPREFIX -I$(InputDir) -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "core - Win32 Release _SMP"
 
-# Begin Custom Build - Assembling $(InputPath)
-IntDir=.\Release_SMP
-InputPath=..\..\src\image\x86_asm\yuyv_to_yv12_mmx.asm
-InputName=yuyv_to_yv12_mmx
-
-"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
-
-# End Custom Build
-
 !ENDIF 
 
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\image\x86_asm\yv12_to_rgb24_mmx.asm
+SOURCE=..\..\src\image\x86_asm\interpolate8x8_3dn.asm
 
 !IF  "$(CFG)" == "core - Win32 Release"
 
 # Begin Custom Build - Assembling $(InputPath)
 IntDir=.\Release
-InputPath=..\..\src\image\x86_asm\yv12_to_rgb24_mmx.asm
-InputName=yv12_to_rgb24_mmx
+InputPath=..\..\src\image\x86_asm\interpolate8x8_3dn.asm
+InputName=interpolate8x8_3dn
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
@@ -653,8 +504,8 @@
 
 # Begin Custom Build - Assembling $(InputPath)
 IntDir=.\Debug
-InputPath=..\..\src\image\x86_asm\yv12_to_rgb24_mmx.asm
-InputName=yv12_to_rgb24_mmx
+InputPath=..\..\src\image\x86_asm\interpolate8x8_3dn.asm
+InputName=interpolate8x8_3dn
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
@@ -665,8 +516,8 @@
 
 # Begin Custom Build - Assembling $(InputPath)
 IntDir=.\Release_SMP
-InputPath=..\..\src\image\x86_asm\yv12_to_rgb24_mmx.asm
-InputName=yv12_to_rgb24_mmx
+InputPath=..\..\src\image\x86_asm\interpolate8x8_3dn.asm
+InputName=interpolate8x8_3dn
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
@@ -678,14 +529,14 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\image\x86_asm\yv12_to_rgb32_mmx.asm
+SOURCE=..\..\src\image\x86_asm\interpolate8x8_mmx.asm
 
 !IF  "$(CFG)" == "core - Win32 Release"
 
 # Begin Custom Build - Assembling $(InputPath)
 IntDir=.\Release
-InputPath=..\..\src\image\x86_asm\yv12_to_rgb32_mmx.asm
-InputName=yv12_to_rgb32_mmx
+InputPath=..\..\src\image\x86_asm\interpolate8x8_mmx.asm
+InputName=interpolate8x8_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
@@ -696,8 +547,8 @@
 
 # Begin Custom Build - Assembling $(InputPath)
 IntDir=.\Debug
-InputPath=..\..\src\image\x86_asm\yv12_to_rgb32_mmx.asm
-InputName=yv12_to_rgb32_mmx
+InputPath=..\..\src\image\x86_asm\interpolate8x8_mmx.asm
+InputName=interpolate8x8_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
@@ -708,8 +559,8 @@
 
 # Begin Custom Build - Assembling $(InputPath)
 IntDir=.\Release_SMP
-InputPath=..\..\src\image\x86_asm\yv12_to_rgb32_mmx.asm
-InputName=yv12_to_rgb32_mmx
+InputPath=..\..\src\image\x86_asm\interpolate8x8_mmx.asm
+InputName=interpolate8x8_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
@@ -721,14 +572,14 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\image\x86_asm\yv12_to_yuyv_mmx.asm
+SOURCE=..\..\src\image\x86_asm\interpolate8x8_xmm.asm
 
 !IF  "$(CFG)" == "core - Win32 Release"
 
 # Begin Custom Build - Assembling $(InputPath)
 IntDir=.\Release
-InputPath=..\..\src\image\x86_asm\yv12_to_yuyv_mmx.asm
-InputName=yv12_to_yuyv_mmx
+InputPath=..\..\src\image\x86_asm\interpolate8x8_xmm.asm
+InputName=interpolate8x8_xmm
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
@@ -739,8 +590,8 @@
 
 # Begin Custom Build - Assembling $(InputPath)
 IntDir=.\Debug
-InputPath=..\..\src\image\x86_asm\yv12_to_yuyv_mmx.asm
-InputName=yv12_to_yuyv_mmx
+InputPath=..\..\src\image\x86_asm\interpolate8x8_xmm.asm
+InputName=interpolate8x8_xmm
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
@@ -751,8 +602,8 @@
 
 # Begin Custom Build - Assembling $(InputPath)
 IntDir=.\Release_SMP
-InputPath=..\..\src\image\x86_asm\yv12_to_yuyv_mmx.asm
-InputName=yv12_to_yuyv_mmx
+InputPath=..\..\src\image\x86_asm\interpolate8x8_xmm.asm
+InputName=interpolate8x8_xmm
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
@@ -989,6 +840,10 @@
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\motion\motion_est.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\motion\sad.h
 # End Source File
 # Begin Source File