--- trunk/xvidcore/build/win32/libxvidcore.dsp	2003/02/13 12:50:43	842
+++ branches/dev-api-4/xvidcore/build/win32/libxvidcore.dsp	2003/06/10 10:10:45	1062
@@ -41,7 +41,7 @@
 # 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_LITTLE_ENDIAN" /D "ARCH_IS_32BIT" /D "WIN32" /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 BASE RSC /l 0xc09 /d "NDEBUG"
 # ADD RSC /l 0xc09 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -64,7 +64,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_LITTLE_ENDIAN" /D "ARCH_IS_32BIT" /D "WIN32" /D "_MBCS" /D "_LIB" /FR /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 BASE RSC /l 0xc09 /d "_DEBUG"
 # ADD RSC /l 0xc09 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -85,6 +85,10 @@
 # PROP Default_Filter ""
 # Begin Source File
 
+SOURCE=..\..\doc\_API_.txt
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\authors.txt
 # End Source File
 # Begin Source File
@@ -101,6 +105,18 @@
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\INSTALL
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\LICENSE
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\README.txt
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\todo.txt
 # End Source File
 # Begin Source File
@@ -120,6 +136,37 @@
 # PROP Default_Filter ""
 # Begin Source File
 
+SOURCE=..\..\src\bitstream\x86_asm\cbp_3dne.asm
+
+!IF  "$(CFG)" == "libxvidcore - Win32 Release"
+
+# Begin Custom Build - Assembling $(InputPath)
+IntDir=.\Release
+InputPath=..\..\src\bitstream\x86_asm\cbp_3dne.asm
+InputName=cbp_3dne
+
+"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "libxvidcore - Win32 Debug"
+
+# Begin Custom Build - Assembling $(InputPath)
+IntDir=.\Debug
+InputPath=..\..\src\bitstream\x86_asm\cbp_3dne.asm
+InputName=cbp_3dne
+
+"$(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\bitstream\x86_asm\cbp_mmx.asm
 
 !IF  "$(CFG)" == "libxvidcore - Win32 Release"
@@ -130,7 +177,7 @@
 InputName=cbp_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-        nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -142,7 +189,7 @@
 InputName=cbp_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-        nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -161,7 +208,7 @@
 InputName=cbp_sse2
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-        nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -173,7 +220,7 @@
 InputName=cbp_sse2
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-        nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -236,7 +283,7 @@
 InputName=fdct_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-        nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -248,7 +295,69 @@
 InputName=fdct_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-        nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\dct\x86_asm\fdct_xmm.asm
+
+!IF  "$(CFG)" == "libxvidcore - Win32 Release"
+
+# Begin Custom Build - Assembling $(InputPath)
+IntDir=.\Release
+InputPath=..\..\src\dct\x86_asm\fdct_xmm.asm
+InputName=fdct_xmm
+
+"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "libxvidcore - Win32 Debug"
+
+# Begin Custom Build - Assembling $(InputPath)
+IntDir=.\Debug
+InputPath=..\..\src\dct\x86_asm\fdct_xmm.asm
+InputName=fdct_xmm
+
+"$(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\dct\x86_asm\idct_3dne.asm
+
+!IF  "$(CFG)" == "libxvidcore - Win32 Release"
+
+# Begin Custom Build - Assembling $(InputPath)
+IntDir=.\Release
+InputPath=..\..\src\dct\x86_asm\idct_3dne.asm
+InputName=idct_3dne
+
+"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "libxvidcore - Win32 Debug"
+
+# Begin Custom Build - Assembling $(InputPath)
+IntDir=.\Debug
+InputPath=..\..\src\dct\x86_asm\idct_3dne.asm
+InputName=idct_3dne
+
+"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -267,7 +376,7 @@
 InputName=idct_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-        nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -279,7 +388,38 @@
 InputName=idct_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-        nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\dct\x86_asm\simple_idct_mmx.asm
+
+!IF  "$(CFG)" == "libxvidcore - Win32 Release"
+
+# Begin Custom Build - Assembling $(InputPath)
+IntDir=.\Release
+InputPath=..\..\src\dct\x86_asm\simple_idct_mmx.asm
+InputName=simple_idct_mmx
+
+"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "libxvidcore - Win32 Debug"
+
+# Begin Custom Build - Assembling $(InputPath)
+IntDir=.\Debug
+InputPath=..\..\src\dct\x86_asm\simple_idct_mmx.asm
+InputName=simple_idct_mmx
+
+"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -307,6 +447,10 @@
 
 SOURCE=..\..\src\dct\idct.c
 # End Source File
+# Begin Source File
+
+SOURCE=..\..\src\dct\simple_idct.c
+# End Source File
 # End Group
 # Begin Group "image"
 
@@ -316,60 +460,35 @@
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\src\image\x86_asm\interpolate8x8_3dn.asm
-
-!IF  "$(CFG)" == "libxvidcore - 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)" == "libxvidcore - 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
-
-!ENDIF 
-
+SOURCE=..\..\src\image\x86_asm\colorspace_mmx.inc
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\image\x86_asm\interpolate8x8_mmx.asm
+SOURCE=..\..\src\image\x86_asm\colorspace_rgb_mmx.asm
 
 !IF  "$(CFG)" == "libxvidcore - Win32 Release"
 
 # Begin Custom Build - Assembling $(InputPath)
+InputDir=\xvid\stable4\src\image\x86_asm
 IntDir=.\Release
-InputPath=..\..\src\image\x86_asm\interpolate8x8_mmx.asm
-InputName=interpolate8x8_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)" == "libxvidcore - Win32 Debug"
 
 # Begin Custom Build - Assembling $(InputPath)
+InputDir=\xvid\stable4\src\image\x86_asm
 IntDir=.\Debug
-InputPath=..\..\src\image\x86_asm\interpolate8x8_mmx.asm
-InputName=interpolate8x8_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
 
@@ -378,29 +497,31 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\image\x86_asm\interpolate8x8_xmm.asm
+SOURCE=..\..\src\image\x86_asm\colorspace_yuv_mmx.asm
 
 !IF  "$(CFG)" == "libxvidcore - Win32 Release"
 
 # Begin Custom Build - Assembling $(InputPath)
+InputDir=\xvid\stable4\src\image\x86_asm
 IntDir=.\Release
-InputPath=..\..\src\image\x86_asm\interpolate8x8_xmm.asm
-InputName=interpolate8x8_xmm
+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)" == "libxvidcore - Win32 Debug"
 
 # Begin Custom Build - Assembling $(InputPath)
+InputDir=\xvid\stable4\src\image\x86_asm
 IntDir=.\Debug
-InputPath=..\..\src\image\x86_asm\interpolate8x8_xmm.asm
-InputName=interpolate8x8_xmm
+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
 
@@ -409,29 +530,31 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\image\x86_asm\rgb_to_yv12_mmx.asm
+SOURCE=..\..\src\image\x86_asm\colorspace_yuyv_mmx.asm
 
 !IF  "$(CFG)" == "libxvidcore - Win32 Release"
 
 # Begin Custom Build - Assembling $(InputPath)
+InputDir=\xvid\stable4\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_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)" == "libxvidcore - Win32 Debug"
 
 # Begin Custom Build - Assembling $(InputPath)
+InputDir=\xvid\stable4\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_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
 
@@ -440,17 +563,17 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\image\x86_asm\yuv_to_yv12_mmx.asm
+SOURCE=..\..\src\image\x86_asm\interpolate8x8_3dn.asm
 
 !IF  "$(CFG)" == "libxvidcore - Win32 Release"
 
 # Begin Custom Build - Assembling $(InputPath)
 IntDir=.\Release
-InputPath=..\..\src\image\x86_asm\yuv_to_yv12_mmx.asm
-InputName=yuv_to_yv12_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)
+	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -458,11 +581,11 @@
 
 # Begin Custom Build - Assembling $(InputPath)
 IntDir=.\Debug
-InputPath=..\..\src\image\x86_asm\yuv_to_yv12_mmx.asm
-InputName=yuv_to_yv12_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)
+	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -471,17 +594,17 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\image\x86_asm\yuyv_to_yv12_mmx.asm
+SOURCE=..\..\src\image\x86_asm\interpolate8x8_3dne.asm
 
 !IF  "$(CFG)" == "libxvidcore - Win32 Release"
 
 # Begin Custom Build - Assembling $(InputPath)
 IntDir=.\Release
-InputPath=..\..\src\image\x86_asm\yuyv_to_yv12_mmx.asm
-InputName=yuyv_to_yv12_mmx
+InputPath=..\..\src\image\x86_asm\interpolate8x8_3dne.asm
+InputName=interpolate8x8_3dne
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-        nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -489,11 +612,11 @@
 
 # Begin Custom Build - Assembling $(InputPath)
 IntDir=.\Debug
-InputPath=..\..\src\image\x86_asm\yuyv_to_yv12_mmx.asm
-InputName=yuyv_to_yv12_mmx
+InputPath=..\..\src\image\x86_asm\interpolate8x8_3dne.asm
+InputName=interpolate8x8_3dne
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-        nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -502,17 +625,17 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\image\x86_asm\yv12_to_rgb24_mmx.asm
+SOURCE=..\..\src\image\x86_asm\interpolate8x8_mmx.asm
 
 !IF  "$(CFG)" == "libxvidcore - 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_mmx.asm
+InputName=interpolate8x8_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-        nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -520,11 +643,11 @@
 
 # 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_mmx.asm
+InputName=interpolate8x8_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-        nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -533,17 +656,17 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\image\x86_asm\yv12_to_rgb32_mmx.asm
+SOURCE=..\..\src\image\x86_asm\interpolate8x8_xmm.asm
 
 !IF  "$(CFG)" == "libxvidcore - 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_xmm.asm
+InputName=interpolate8x8_xmm
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-        nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -551,11 +674,11 @@
 
 # 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_xmm.asm
+InputName=interpolate8x8_xmm
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-        nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -564,17 +687,17 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\image\x86_asm\yv12_to_yuyv_mmx.asm
+SOURCE=..\..\src\image\x86_asm\reduced_mmx.asm
 
 !IF  "$(CFG)" == "libxvidcore - 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\reduced_mmx.asm
+InputName=reduced_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-        nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -582,11 +705,11 @@
 
 # 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\reduced_mmx.asm
+InputName=reduced_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-        nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -603,12 +726,20 @@
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\image\font.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\image\image.h
 # End Source File
 # Begin Source File
 
 SOURCE=..\..\src\image\interpolate8x8.h
 # End Source File
+# Begin Source File
+
+SOURCE=..\..\src\image\reduced.h
+# End Source File
 # End Group
 # Begin Source File
 
@@ -616,12 +747,20 @@
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\image\font.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\image\image.c
 # End Source File
 # Begin Source File
 
 SOURCE=..\..\src\image\interpolate8x8.c
 # End Source File
+# Begin Source File
+
+SOURCE=..\..\src\image\reduced.c
+# End Source File
 # End Group
 # Begin Group "motion"
 
@@ -642,7 +781,7 @@
 InputName=sad_3dn
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-        nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -654,7 +793,38 @@
 InputName=sad_3dn
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-        nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\motion\x86_asm\sad_3dne.asm
+
+!IF  "$(CFG)" == "libxvidcore - Win32 Release"
+
+# Begin Custom Build - Assembling $(InputPath)
+IntDir=.\Release
+InputPath=..\..\src\motion\x86_asm\sad_3dne.asm
+InputName=sad_3dne
+
+"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "libxvidcore - Win32 Debug"
+
+# Begin Custom Build - Assembling $(InputPath)
+IntDir=.\Debug
+InputPath=..\..\src\motion\x86_asm\sad_3dne.asm
+InputName=sad_3dne
+
+"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -673,7 +843,7 @@
 InputName=sad_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-        nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -685,7 +855,7 @@
 InputName=sad_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-        nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -704,7 +874,7 @@
 InputName=sad_sse2
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-        nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -716,7 +886,7 @@
 InputName=sad_sse2
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-        nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -735,7 +905,7 @@
 InputName=sad_xmm
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-        nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -747,7 +917,7 @@
 InputName=sad_xmm
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-        nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -764,8 +934,16 @@
 # 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
+
+SOURCE=..\..\src\motion\smp_motion_est.h
+# End Source File
 # End Group
 # Begin Source File
 
@@ -779,6 +957,10 @@
 
 SOURCE=..\..\src\motion\sad.c
 # End Source File
+# Begin Source File
+
+SOURCE=..\..\src\motion\smp_motion_est.c
+# End Source File
 # End Group
 # Begin Group "prediction"
 
@@ -814,7 +996,7 @@
 InputName=quantize4_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-        nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -826,7 +1008,69 @@
 InputName=quantize4_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-        nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\quant\x86_asm\quantize4_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
+
+"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "libxvidcore - Win32 Debug"
+
+# Begin Custom Build - Assembling $(InputPath)
+IntDir=.\Debug
+InputPath=..\..\src\quant\x86_asm\quantize4_xmm.asm
+InputName=quantize4_xmm
+
+"$(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\quant\x86_asm\quantize_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
+
+"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "libxvidcore - Win32 Debug"
+
+# Begin Custom Build - Assembling $(InputPath)
+IntDir=.\Debug
+InputPath=..\..\src\quant\x86_asm\quantize_3dne.asm
+InputName=quantize_3dne
+
+"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -845,7 +1089,7 @@
 InputName=quantize_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-        nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -857,7 +1101,7 @@
 InputName=quantize_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-        nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -870,10 +1114,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
@@ -887,10 +1127,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
@@ -920,7 +1156,7 @@
 InputName=cpuid
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-        nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -932,7 +1168,69 @@
 InputName=cpuid
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-        nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\utils\x86_asm\interlacing_mmx.asm
+
+!IF  "$(CFG)" == "libxvidcore - Win32 Release"
+
+# Begin Custom Build - Assembling $(InputPath)
+IntDir=.\Release
+InputPath=..\..\src\utils\x86_asm\interlacing_mmx.asm
+InputName=interlacing_mmx
+
+"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "libxvidcore - Win32 Debug"
+
+# Begin Custom Build - Assembling $(InputPath)
+IntDir=.\Debug
+InputPath=..\..\src\utils\x86_asm\interlacing_mmx.asm
+InputName=interlacing_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\utils\x86_asm\mem_transfer_3dne.asm
+
+!IF  "$(CFG)" == "libxvidcore - Win32 Release"
+
+# Begin Custom Build - Assembling $(InputPath)
+IntDir=.\Release
+InputPath=..\..\src\utils\x86_asm\mem_transfer_3dne.asm
+InputName=mem_transfer_3dne
+
+"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "libxvidcore - Win32 Debug"
+
+# Begin Custom Build - Assembling $(InputPath)
+IntDir=.\Debug
+InputPath=..\..\src\utils\x86_asm\mem_transfer_3dne.asm
+InputName=mem_transfer_3dne
+
+"$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -951,7 +1249,7 @@
 InputName=mem_transfer_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-        nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -963,7 +1261,7 @@
 InputName=mem_transfer_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-        nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -1017,10 +1315,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
@@ -1033,10 +1327,6 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\divx4.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\src\encoder.h
 # End Source File
 # Begin Source File
@@ -1052,13 +1342,41 @@
 SOURCE=..\..\src\xvid.h
 # End Source File
 # End Group
+# Begin Group "plugins"
+
+# PROP Default_Filter ""
+# Begin Group "plugins_h"
+
+# PROP Default_Filter ""
+# End Group
 # Begin Source File
 
-SOURCE=..\..\src\decoder.c
+SOURCE=..\..\src\plugins\plugin_2pass1.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\divx4.c
+SOURCE=..\..\src\plugins\plugin_2pass2.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\plugins\plugin_dump.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\plugins\plugin_lumimasking.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\plugins\plugin_psnr.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\plugins\plugin_single.c
+# End Source File
+# End Group
+# Begin Source File
+
+SOURCE=..\..\src\decoder.c
 # End Source File
 # Begin Source File