--- branches/dev-api-4/xvidcore/build/win32/libxvidcore.dsp	2003/10/21 16:48:58	1182
+++ branches/dev-api-4/xvidcore/build/win32/libxvidcore.dsp	2003/11/29 18:07:45	1228
@@ -25,7 +25,7 @@
 # PROP AllowPerConfigDependencies 0
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
-CPP=xicl6.exe
+CPP=cl.exe
 RSC=rc.exe
 
 !IF  "$(CFG)" == "libxvidcore - Win32 Release"
@@ -41,8 +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 /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 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 /O2 -QxK /Qunroll /c
+# SUBTRACT CPP /Fr
 # ADD BASE RSC /l 0xc09 /d "NDEBUG"
 # ADD RSC /l 0xc09 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -86,15 +86,11 @@
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\doc\_API_.txt
+SOURCE=..\..\AUTHORS
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\authors.txt
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\changelog.txt
+SOURCE=..\..\ChangeLog
 # End Source File
 # Begin Source File
 
@@ -102,31 +98,23 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\gpl.txt
-# 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
+SOURCE=..\..\README
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\todo.txt
+SOURCE=..\..\TODO
 # End Source File
 # Begin Source File
 
-SOURCE="..\..\doc\xvid-decoding.txt"
+SOURCE="..\..\doc\README"
 # End Source File
 # Begin Source File
 
-SOURCE="..\..\doc\xvid-encoder.txt"
+SOURCE="..\..\doc\INSTALL"
 # End Source File
 # End Group
 # Begin Group "bitstream"
@@ -274,14 +262,45 @@
 # 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_ffmpeg.asm
+InputName=fdct_mmx_ffmpeg
+
+"$(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_mmx_ffmpeg.asm
+InputName=fdct_mmx_ffmpeg
+
+"$(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_mmx_skal.asm
 
 !IF  "$(CFG)" == "libxvidcore - Win32 Release"
 
 # Begin Custom Build - Assembling $(InputPath)
 IntDir=.\Release
-InputPath=..\..\src\dct\x86_asm\fdct_mmx.asm
-InputName=fdct_mmx
+InputPath=..\..\src\dct\x86_asm\fdct_mmx_skal.asm
+InputName=fdct_mmx_skal
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
@@ -292,8 +311,8 @@
 
 # Begin Custom Build - Assembling $(InputPath)
 IntDir=.\Debug
-InputPath=..\..\src\dct\x86_asm\fdct_mmx.asm
-InputName=fdct_mmx
+InputPath=..\..\src\dct\x86_asm\fdct_mmx_skal.asm
+InputName=fdct_mmx_skal
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
@@ -305,14 +324,14 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\dct\x86_asm\fdct_xmm.asm
+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_xmm.asm
-InputName=fdct_xmm
+InputPath=..\..\src\dct\x86_asm\fdct_sse2_skal.asm
+InputName=fdct_sse2_skal
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
@@ -323,8 +342,8 @@
 
 # Begin Custom Build - Assembling $(InputPath)
 IntDir=.\Debug
-InputPath=..\..\src\dct\x86_asm\fdct_xmm.asm
-InputName=fdct_xmm
+InputPath=..\..\src\dct\x86_asm\fdct_sse2_skal.asm
+InputName=fdct_sse2_skal
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 	nasm -f win32 -DPREFIX -o $(IntDir)\$(InputName).obj $(InputPath)
@@ -398,6 +417,37 @@
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\src\dct\x86_asm\idct_sse2_dmitry.asm
+
+!IF  "$(CFG)" == "libxvidcore - Win32 Release"
+
+# Begin Custom Build - Assembling $(InputPath)
+IntDir=.\Release
+InputPath=..\..\src\dct\x86_asm\idct_sse2_dmitry.asm
+InputName=idct_sse2_dmitry
+
+"$(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_sse2_dmitry.asm
+InputName=idct_sse2_dmitry
+
+"$(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\simple_idct_mmx.asm
 
 !IF  "$(CFG)" == "libxvidcore - Win32 Release"
@@ -470,26 +520,26 @@
 !IF  "$(CFG)" == "libxvidcore - Win32 Release"
 
 # Begin Custom Build - Assembling $(InputPath)
-InputDir=\^^^dev-api-4\!!\xvidcore\src\image\x86_asm\
+InputDir=\xvidcore\src\image\x86_asm
 IntDir=.\Release
 InputPath=..\..\src\image\x86_asm\colorspace_rgb_mmx.asm
 InputName=colorspace_rgb_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -I"$(InputDir)" -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=\^^^dev-api-4\!!\xvidcore\src\image\x86_asm\
+InputDir=\xvidcore\src\image\x86_asm
 IntDir=.\Debug
 InputPath=..\..\src\image\x86_asm\colorspace_rgb_mmx.asm
 InputName=colorspace_rgb_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -I"$(InputDir)" -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -f win32 -DPREFIX -I"$(InputDir)"\ -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -503,26 +553,26 @@
 !IF  "$(CFG)" == "libxvidcore - Win32 Release"
 
 # Begin Custom Build - Assembling $(InputPath)
-InputDir=\^^^dev-api-4\!!\xvidcore\src\image\x86_asm\
+InputDir=\xvidcore\src\image\x86_asm
 IntDir=.\Release
 InputPath=..\..\src\image\x86_asm\colorspace_yuv_mmx.asm
 InputName=colorspace_yuv_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -I"$(InputDir)" -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=\^^^dev-api-4\!!\xvidcore\src\image\x86_asm\
+InputDir=\xvidcore\src\image\x86_asm
 IntDir=.\Debug
 InputPath=..\..\src\image\x86_asm\colorspace_yuv_mmx.asm
 InputName=colorspace_yuv_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -I"$(InputDir)" -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -f win32 -DPREFIX -I"$(InputDir)"\ -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -536,26 +586,26 @@
 !IF  "$(CFG)" == "libxvidcore - Win32 Release"
 
 # Begin Custom Build - Assembling $(InputPath)
-InputDir=\^^^dev-api-4\!!\xvidcore\src\image\x86_asm\
+InputDir=\xvidcore\src\image\x86_asm
 IntDir=.\Release
 InputPath=..\..\src\image\x86_asm\colorspace_yuyv_mmx.asm
 InputName=colorspace_yuyv_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -I"$(InputDir)" -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=\^^^dev-api-4\!!\xvidcore\src\image\x86_asm\
+InputDir=\xvidcore\src\image\x86_asm
 IntDir=.\Debug
 InputPath=..\..\src\image\x86_asm\colorspace_yuyv_mmx.asm
 InputName=colorspace_yuyv_mmx
 
 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	nasm -f win32 -DPREFIX -I"$(InputDir)" -o $(IntDir)\$(InputName).obj $(InputPath)
+	nasm -f win32 -DPREFIX -I"$(InputDir)"\ -o $(IntDir)\$(InputName).obj $(InputPath)
 
 # End Custom Build
 
@@ -692,7 +742,7 @@
 
 !IF  "$(CFG)" == "libxvidcore - Win32 Release"
 
-# Begin Custom Build
+# Begin Custom Build - Assembling $(InputPath)
 IntDir=.\Release
 InputPath=..\..\src\image\x86_asm\qpel_mmx.asm
 InputName=qpel_mmx
@@ -704,6 +754,16 @@
 
 !ELSEIF  "$(CFG)" == "libxvidcore - Win32 Debug"
 
+# Begin Custom Build - Assembling $(InputPath)
+IntDir=.\Debug
+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
+
 !ENDIF 
 
 # End Source File
@@ -1036,14 +1096,14 @@
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\..\src\quant\x86_asm\quantize_mpeg_mmx.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_mpeg_mmx.asm
-InputName=quantize_mpeg_mmx
+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)
@@ -1054,8 +1114,8 @@
 
 # Begin Custom Build - Assembling $(InputPath)
 IntDir=.\Debug
-InputPath=..\..\src\quant\x86_asm\quantize_mpeg_mmx.asm
-InputName=quantize_mpeg_mmx
+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)
@@ -1067,14 +1127,14 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\quant\x86_asm\quantize_mpeg_xmm.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_mpeg_xmm.asm
-InputName=quantize_mpeg_xmm
+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)
@@ -1085,8 +1145,8 @@
 
 # Begin Custom Build - Assembling $(InputPath)
 IntDir=.\Debug
-InputPath=..\..\src\quant\x86_asm\quantize_mpeg_xmm.asm
-InputName=quantize_mpeg_xmm
+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)
@@ -1098,14 +1158,14 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\quant\x86_asm\quantize_h263_3dne.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\quantize_h263_3dne.asm
-InputName=quantize_h263_3dne
+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)
@@ -1116,8 +1176,8 @@
 
 # Begin Custom Build - Assembling $(InputPath)
 IntDir=.\Debug
-InputPath=..\..\src\quant\x86_asm\quantize_h263_3dne.asm
-InputName=quantize_h263_3dne
+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)
@@ -1129,14 +1189,14 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\src\quant\x86_asm\quantize_h263_mmx.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\quantize_h263_mmx.asm
-InputName=quantize_h263_mmx
+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)
@@ -1147,8 +1207,8 @@
 
 # Begin Custom Build - Assembling $(InputPath)
 IntDir=.\Debug
-InputPath=..\..\src\quant\x86_asm\quantize_h263_mmx.asm
-InputName=quantize_h263_mmx
+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)