--- branches/dev-api-4/xvidcore/build/win32/libxvidcore.dsp	2003/09/11 12:33:12	1143
+++ branches/dev-api-4/xvidcore/build/win32/libxvidcore.dsp	2003/10/29 12:41:41	1195
@@ -274,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)"
@@ -292,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)"
@@ -305,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)"
@@ -323,7 +323,38 @@
 
 # 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)"
+	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_sse2_skal.asm
+
+!IF  "$(CFG)" == "libxvidcore - Win32 Release"
+
+# Begin Custom Build - Assembling $(InputPath)
+IntDir=.\Release
+InputPath=..\..\src\dct\x86_asm\fdct_sse2_skal.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_sse2_skal.asm
 InputName=fdct_xmm
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
@@ -470,7 +501,7 @@
 !IF  "$(CFG)" == "libxvidcore - Win32 Release"
 
 # Begin Custom Build - Assembling $(InputPath)
-InputDir=\^^^dev-api-4\!!\xvidcore\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
@@ -483,7 +514,7 @@
 !ELSEIF  "$(CFG)" == "libxvidcore - Win32 Debug"
 
 # Begin Custom Build - Assembling $(InputPath)
-InputDir=\^^^dev-api-4\!!\xvidcore\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
@@ -503,7 +534,7 @@
 !IF  "$(CFG)" == "libxvidcore - Win32 Release"
 
 # Begin Custom Build - Assembling $(InputPath)
-InputDir=\^^^dev-api-4\!!\xvidcore\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
@@ -516,7 +547,7 @@
 !ELSEIF  "$(CFG)" == "libxvidcore - Win32 Debug"
 
 # Begin Custom Build - Assembling $(InputPath)
-InputDir=\^^^dev-api-4\!!\xvidcore\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
@@ -536,7 +567,7 @@
 !IF  "$(CFG)" == "libxvidcore - Win32 Release"
 
 # Begin Custom Build - Assembling $(InputPath)
-InputDir=\^^^dev-api-4\!!\xvidcore\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
@@ -549,7 +580,7 @@
 !ELSEIF  "$(CFG)" == "libxvidcore - Win32 Debug"
 
 # Begin Custom Build - Assembling $(InputPath)
-InputDir=\^^^dev-api-4\!!\xvidcore\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
@@ -1036,14 +1067,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)
@@ -1054,8 +1085,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)
@@ -1067,14 +1098,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)
@@ -1085,8 +1116,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)
@@ -1098,14 +1129,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)
@@ -1116,8 +1147,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)
@@ -1129,14 +1160,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)
@@ -1147,8 +1178,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)
@@ -1164,16 +1195,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
 
@@ -1185,7 +1212,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"