Changes - j0ke.net Open Build Service

Changes of Revision 14

[-] [+]	Changed	xvid.spec
@@ -3,20 +3,20 @@ %define soname 4 Name: xvidcore -Version: 1.2.1 -Release: 1 +Version: 1.2.2 +Release: 15 Summary: Xvid is a high quality MPEG-4 ASP video codec. Summary(de): Xvid ist ein hochqualitativer MPEG-4 ASP Videocodec. License: GNU General Public License (GPL) Group: Development/Libraries URL: http://www.xvid.org/ -Source0: %{name}-%{version}.tar.bz2 +Source0: xvidcore-1.2.2.tar.bz2 Requires: lib%{name}%{soname} = %{version}-%{release} Obsoletes: xvid Provides: xvid = %{version}-%{release} -BuildRequires: gcc-c++ yasm make pkgconfig nasm +BuildRequires: gcc-c++ make pkgconfig nasm BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(id -u -n) %description @@ -93,22 +93,20 @@ %files %defattr(644,root,root,755) -%doc doc +%doc AUTHORS ChangeLog LICENSE README TODO %files -n lib%{name}-devel %defattr(644,root,root,755) -%doc CodingStyle examples +%doc CodingStyle doc examples %{_includedir}/.h %{_libdir}/.so %{_libdir}/.a %files -n lib%{name}%{soname} -%defattr(-,root,root) -%doc AUTHORS ChangeLog LICENSE README TODO +%defattr(644,root,root,755) %{_libdir}/libxvidcore.so.%{soname} %{_libdir}/libxvidcore.so.%{soname}. %changelog * Sun Sep 30 2007 Carsten Schoene <cs@linux-administrator.com> - import for SLE_10 build - x 1 @@ -3,20 +3,20 @@ 2 %define soname 4 3 4 Name: xvidcore 5 -Version: 1.2.1 6 -Release: 1 7 +Version: 1.2.2 8 +Release: 15 9 Summary: Xvid is a high quality MPEG-4 ASP video codec. 10 Summary(de): Xvid ist ein hochqualitativer MPEG-4 ASP Videocodec. 11 License: GNU General Public License (GPL) 12 Group: Development/Libraries 13 URL: http://www.xvid.org/ 14 15 -Source0: %{name}-%{version}.tar.bz2 16 +Source0: xvidcore-1.2.2.tar.bz2 17 18 Requires: lib%{name}%{soname} = %{version}-%{release} 19 Obsoletes: xvid 20 Provides: xvid = %{version}-%{release} 21 -BuildRequires: gcc-c++ yasm make pkgconfig nasm 22 +BuildRequires: gcc-c++ make pkgconfig nasm 23 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(id -u -n) 24 25 %description 26 @@ -93,22 +93,20 @@ 27 28 %files 29 %defattr(644,root,root,755) 30 -%doc doc 31 +%doc AUTHORS ChangeLog LICENSE README TODO 32 33 %files -n lib%{name}-devel 34 %defattr(644,root,root,755) 35 -%doc CodingStyle examples 36 +%doc CodingStyle doc examples 37 %{_includedir}/.h 38 %{_libdir}/.so 39 %{_libdir}/.a 40 41 %files -n lib%{name}%{soname} 42 -%defattr(-,root,root) 43 -%doc AUTHORS ChangeLog LICENSE README TODO 44 +%defattr(644,root,root,755) 45 %{_libdir}/libxvidcore.so.%{soname} 46 %{_libdir}/libxvidcore.so.%{soname}. 47 48 %changelog 49 * Sun Sep 30 2007 Carsten Schoene <cs@linux-administrator.com> 50 - import for SLE_10 build 51 - 52
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/ChangeLog ^
@@ -1,6 +1,94 @@ # Note that this ChangeLog covers only changes to the HEAD branch --------------------- +Date: 2009/05/27 14:46:09 +Author: Isibaar +Branch: release-1_2-branch +Tag: (none) +Log: +back-port from HEAD: + - add resync-marker range check + - return E_FAIL on XVID_ERR_MEMORY error in dshow + +Members: + dshow/src/CXvidDecoder.cpp:1.16->1.16.2.1 + src/decoder.c:1.80->1.80.2.2 + +--------------------- +Date: 2009/05/25 11:25:50 +Author: Isibaar +Branch: release-1_2-branch +Tag: (none) +Log: +back-ported OSX fix and nasm version note from HEAD + +Members: + doc/README:1.2->1.2.6.1 + src/dct/x86_asm/fdct_sse2_skal.asm:1.10->1.10.2.2 + +--------------------- +Date: 2009/05/25 11:03:47 +Author: Isibaar +Branch: release-1_2-branch +Tag: (none) +Log: +updated IA64 license headers from HEAD + +Members: + src/dct/ia64_asm/fdct_ia64.s:1.5->1.5.10.1 + src/dct/ia64_asm/idct_fini.s:1.1->1.1.14.1 + src/dct/ia64_asm/idct_ia64_ecc.s:1.1->1.1.14.1 + src/dct/ia64_asm/idct_ia64_gcc.s:1.1->1.1.14.1 + src/dct/ia64_asm/idct_init.s:1.1->1.1.14.1 + src/image/ia64_asm/interpolate8x8_ia64.s:1.5->1.5.14.1 + src/image/ia64_asm/interpolate8x8_ia64_exact.s:1.1->1.1.14.1 + src/image/x86_asm/colorspace_mmx.inc:1.7->1.7.2.1 + src/motion/motion.h:1.24->1.24.2.1 + src/motion/ia64_asm/calc_delta_1.s:1.1->1.1.14.1 + src/motion/ia64_asm/calc_delta_2.s:1.1->1.1.14.1 + src/motion/ia64_asm/calc_delta_3.s:1.1->1.1.14.1 + src/motion/ia64_asm/halfpel8_refine_ia64.s:1.3->1.3.14.1 + src/motion/ia64_asm/sad_ia64.s:1.7->1.7.10.1 + src/quant/ia64_asm/quant_h263_ia64.s:1.6->1.6.6.1 + src/utils/ia64_asm/mem_transfer_ia64.s:1.5->1.5.10.1 + +--------------------- +Date: 2009/05/25 10:31:15 +Author: Isibaar +Branch: release-1_2-branch +Tag: (none) +Log: +backport some fixes from HEAD: +- Add -D_WIN32_IE=0x0501 to vfw makefile +- Improved YUV<->RGB precision patch +- RGB24 access violation patch +- Quotes around path names for MSVC6 project files + +Members: + build/win32/libxvidcore.dsp:1.15->1.15.2.1 + build/win32/libxvidcore_static.dsp:1.5->1.5.2.1 + debian/control:1.2->1.2.2.2 + src/image/colorspace.c:1.14->1.14.2.1 + src/image/image.c:1.43->1.43.2.1 + src/image/x86_asm/colorspace_rgb_mmx.asm:1.10->1.10.2.1 + vfw/bin/Makefile:1.6->1.6.2.1 + +--------------------- +Date: 2009/05/25 10:09:23 +Author: Isibaar +Branch: release-1_2-branch +Tag: (none) +Log: +increase version number to 1.2.2 +add '-arch ppc' for Apple PPC target + +Members: + build/generic/configure.in:1.25->1.25.2.2 + debian/changelog:1.2.2.3->1.2.2.4 + src/xvid.c:1.77.2.4->1.77.2.5 + src/xvid.h:1.63.2.2->1.63.2.3 + +--------------------- Date: 2008/12/02 15:00:09 Author: Isibaar Branch: release-1_2-branch
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/build/generic/configure ^
@@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for Xvid 1.2.1. +# Generated by GNU Autoconf 2.59 for Xvid 1.2.2. # # Report bugs to <xvid-devel@xvid.org>. # @@ -269,8 +269,8 @@ # Identity of this package. PACKAGE_NAME='Xvid' PACKAGE_TARNAME='xvid' -PACKAGE_VERSION='1.2.1' -PACKAGE_STRING='Xvid 1.2.1' +PACKAGE_VERSION='1.2.2' +PACKAGE_STRING='Xvid 1.2.2' PACKAGE_BUGREPORT='xvid-devel@xvid.org' ac_unique_file="configure.in" @@ -312,7 +312,7 @@ # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB CPP EGREP ac_nasm FEATURES ARCHITECTURE BUS ENDIANNESS SHARED_EXTENSION STATIC_EXTENSION OBJECT_EXTENSION NASM_FORMAT AS AFLAGS ASSEMBLY_EXTENSION GENERIC_SOURCES ASSEMBLY_SOURCES SPECIFIC_LDFLAGS SPECIFIC_CFLAGS DCT_IA64_SOURCES PPC_ALTIVEC_SOURCES API_MAJOR API_MINOR STATIC_LIB PRE_SHARED_LIB SHARED_LIB LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB CPP EGREP ac_yasm ac_nasm FEATURES ARCHITECTURE BUS ENDIANNESS SHARED_EXTENSION STATIC_EXTENSION OBJECT_EXTENSION NASM_FORMAT AS AFLAGS ASSEMBLY_EXTENSION GENERIC_SOURCES ASSEMBLY_SOURCES SPECIFIC_LDFLAGS SPECIFIC_CFLAGS DCT_IA64_SOURCES PPC_ALTIVEC_SOURCES API_MAJOR API_MINOR STATIC_LIB PRE_SHARED_LIB SHARED_LIB LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -781,7 +781,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Xvid 1.2.1 to adapt to many kinds of systems. +\`configure' configures Xvid 1.2.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -843,7 +843,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short \| recursive ) echo "Configuration of Xvid 1.2.1:";; + short \| recursive ) echo "Configuration of Xvid 1.2.2:";; esac cat <<\_ACEOF @@ -964,7 +964,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -Xvid configure 1.2.1 +Xvid configure 1.2.2 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -978,7 +978,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Xvid $as_me 1.2.1, which was +It was created by Xvid $as_me 1.2.2, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1319,9 +1319,11 @@ API_MAJOR="4" API_MINOR="2" +minimum_yasm_minor_version=8 minimum_nasm_minor_version=0 minimum_nasm_major_version=2 nasm_prog="nasm" +yasm_prog="yasm" our_cflags_defaults="-Wall" our_cflags_defaults="$our_cflags_defaults -O2" @@ -3874,7 +3876,7 @@ echo "$as_me:$LINENO: result: dylib options" >&5 echo "${ECHO_T}dylib options" >&6 SHARED_LIB="libxvidcore.\$(API_MAJOR).\$(SHARED_EXTENSION)" - SPECIFIC_LDFLAGS="-dynamiclib -flat_namespace -compatibility_version \$(API_MAJOR) -current_version \$(API_MAJOR).\$(API_MINOR) -install_name \$(libdir)/\$(SHARED_LIB)" + SPECIFIC_LDFLAGS="-Wl,-read_only_relocs,suppress -dynamiclib -flat_namespace -compatibility_version \$(API_MAJOR) -current_version \$(API_MAJOR).\$(API_MINOR) -install_name \$(libdir)/\$(SHARED_LIB)" else echo "$as_me:$LINENO: result: module options" >&5 echo "${ECHO_T}module options" >&6 @@ -3919,6 +3921,78 @@ found_nasm_comp_prog="no" chosen_asm_prog="" + # Extract the first word of "$yasm_prog", so it can be a program name with args. +set dummy $yasm_prog; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_yasm+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_yasm"; then + ac_cv_prog_ac_yasm="$ac_yasm" # Let the user override the test. +else + ac_prog_rejected=no +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if test "$as_dir/$ac_word$ac_exec_ext" = "yes"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_ac_yasm="yes" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + +if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. + set dummy $ac_cv_prog_ac_yasm + shift + if test $# != 0; then + # We chose a different compiler from the bogus one. + # However, it has the same basename, so the bogon will be chosen + # first if we set ac_yasm to just the basename; use the full file name. + shift + ac_cv_prog_ac_yasm="$as_dir/$ac_word${1+' '}$@" + fi +fi + test -z "$ac_cv_prog_ac_yasm" && ac_cv_prog_ac_yasm="no" +fi +fi +ac_yasm=$ac_cv_prog_ac_yasm +if test -n "$ac_yasm"; then + echo "$as_me:$LINENO: result: $ac_yasm" >&5 +echo "${ECHO_T}$ac_yasm" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + if test "$ac_yasm" = "yes" ; then + echo "$as_me:$LINENO: checking for yasm version" >&5 +echo $ECHO_N "checking for yasm version... $ECHO_C" >&6 + yasm_minor=`$yasm_prog --version \| cut -d '.' -f 2 \| cut -d ' ' -f 1` + if test -z $yasm_minor ; then + yasm_minor=-1 + fi + echo "$as_me:$LINENO: result: $yasm_minor" >&5 +echo "${ECHO_T}$yasm_minor" >&6 + + if test "$yasm_minor" -lt "$minimum_yasm_minor_version" ; then + { echo "$as_me:$LINENO: WARNING: yasm version is too old" >&5 +echo "$as_me: WARNING: yasm version is too old" >&2;} + else + found_nasm_comp_prog="yes" + chosen_asm_prog="$yasm_prog" + fi + fi + if test "$found_nasm_comp_prog" = "no" ; then # Extract the first word of "$nasm_prog", so it can be a program name with args. set dummy $nasm_prog; ac_word=$2 @@ -4063,7 +4137,7 @@ #include <altivec.h> int main() { return(0); } EOF - if $CC -faltivec -c conftest.c 2>/dev/null 1>/dev/null \|\| \ + if $CC -arch ppc -faltivec -c conftest.c 2>/dev/null 1>/dev/null \|\| \ $CC -maltivec -mabi=altivec -c conftest.c 2>/dev/null 1>/dev/null ; then echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 @@ -4090,10 +4164,10 @@ return(0); } EOF - if $CC $TEMP_ALTIVEC -faltivec -c conftest.c 2>/dev/null 1>/dev/null ; then + if $CC $TEMP_ALTIVEC -arch ppc -faltivec -c conftest.c 2>/dev/null 1>/dev/null ; then echo "$as_me:$LINENO: result: yes (Apple)" >&5 echo "${ECHO_T}yes (Apple)" >&6 - SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -faltivec -DHAVE_ALTIVEC_PARENTHESES_DECL $TEMP_ALTIVEC" + SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -arch ppc -faltivec -DHAVE_ALTIVEC_PARENTHESES_DECL $TEMP_ALTIVEC" PPC_ALTIVEC_SOURCES="SRC_PPC_ALTIVEC" else cat > conftest.c << EOF @@ -5077,7 +5151,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by Xvid $as_me 1.2.1, which was +This file was extended by Xvid $as_me 1.2.2, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5132,7 +5206,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -Xvid config.status 1.2.1 +Xvid config.status 1.2.2 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" \| sed 's/[\\""\`\$]/\\\\&/g'`\\" @@ -5345,6 +5419,7 @@ s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t s,@CPP@,$CPP,;t t s,@EGREP@,$EGREP,;t t +s,@ac_yasm@,$ac_yasm,;t t s,@ac_nasm@,$ac_nasm,;t t s,@FEATURES@,$FEATURES,;t t s,@ARCHITECTURE@,$ARCHITECTURE,;t t
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/build/generic/configure.in ^
@@ -8,17 +8,19 @@ AC_PREREQ([2.50]) -AC_INIT([Xvid], [1.2.1], [xvid-devel@xvid.org]) +AC_INIT([Xvid], [1.2.2], [xvid-devel@xvid.org]) AC_CONFIG_SRCDIR(configure.in) dnl Do not forget to increase that when needed. API_MAJOR="4" API_MINOR="2" -dnl NASM version requirement +dnl NASM/YASM version requirement +minimum_yasm_minor_version=8 minimum_nasm_minor_version=0 minimum_nasm_major_version=2 nasm_prog="nasm" +yasm_prog="yasm" dnl Default CFLAGS -- Big impact on overall speed our_cflags_defaults="-Wall" @@ -291,7 +293,7 @@ if test x"$macosx_module" = x"no"; then AC_MSG_RESULT([dylib options]) SHARED_LIB="libxvidcore.\$(API_MAJOR).\$(SHARED_EXTENSION)" - SPECIFIC_LDFLAGS="-dynamiclib -flat_namespace -compatibility_version \$(API_MAJOR) -current_version \$(API_MAJOR).\$(API_MINOR) -install_name \$(libdir)/\$(SHARED_LIB)" + SPECIFIC_LDFLAGS="-Wl,-read_only_relocs,suppress -dynamiclib -flat_namespace -compatibility_version \$(API_MAJOR) -current_version \$(API_MAJOR).\$(API_MINOR) -install_name \$(libdir)/\$(SHARED_LIB)" else AC_MSG_RESULT([module options]) PRE_SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION)-temp.o" @@ -345,6 +347,29 @@ found_nasm_comp_prog="no" chosen_asm_prog="" + dnl Check for yasm first + AC_CHECK_PROG([ac_yasm], [$yasm_prog], [yes], [no], , [yes]) + if test "$ac_yasm" = "yes" ; then + dnl + dnl Checking yasm version + dnl + AC_MSG_CHECKING([for yasm version]) + yasm_minor=`$yasm_prog --version \| cut -d '.' -f 2 \| cut -d ' ' -f 1` + if test -z $yasm_minor ; then + yasm_minor=-1 + fi + AC_MSG_RESULT([$yasm_minor]) + + dnl Actually, yasm >= 0.7.99.2161 should be ok + dnl But I'm too lazy to check also the patch version... + if test "$yasm_minor" -lt "$minimum_yasm_minor_version" ; then + AC_MSG_WARN([yasm version is too old]) + else + found_nasm_comp_prog="yes" + chosen_asm_prog="$yasm_prog" + fi + fi + dnl Check for nasm (not buggy version) if test "$found_nasm_comp_prog" = "no" ; then AC_CHECK_PROG([ac_nasm], [$nasm_prog], [yes], [no], , [yes]) @@ -430,7 +455,7 @@ dnl and GNU gcc with very slight changes to code which can be sumed up by: dnl dnl Apple: -dnl - compile with the option -faltivec +dnl - compile with the option -arch ppc -faltivec dnl - define vectors with parentheses vec = (0,0,0,0) dnl GNU dnl - compile with -maltivec -mabi=altivec @@ -455,7 +480,7 @@ #include <altivec.h> int main() { return(0); } EOF - if $CC -faltivec -c conftest.c 2>/dev/null 1>/dev/null \|\| \ + if $CC -arch ppc -faltivec -c conftest.c 2>/dev/null 1>/dev/null \|\| \ $CC -maltivec -mabi=altivec -c conftest.c 2>/dev/null 1>/dev/null ; then AC_MSG_RESULT(yes) SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -DHAVE_ALTIVEC_H" @@ -479,9 +504,9 @@ return(0); } EOF - if $CC $TEMP_ALTIVEC -faltivec -c conftest.c 2>/dev/null 1>/dev/null ; then + if $CC $TEMP_ALTIVEC -arch ppc -faltivec -c conftest.c 2>/dev/null 1>/dev/null ; then AC_MSG_RESULT([yes (Apple)]) - SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -faltivec -DHAVE_ALTIVEC_PARENTHESES_DECL $TEMP_ALTIVEC" + SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -arch ppc -faltivec -DHAVE_ALTIVEC_PARENTHESES_DECL $TEMP_ALTIVEC" PPC_ALTIVEC_SOURCES="SRC_PPC_ALTIVEC" else cat > conftest.c << EOF
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/build/win32/libxvidcore.dsp ^
@@ -141,7 +141,7 @@ InputName=cbp_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -153,7 +153,7 @@ InputName=cbp_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -172,8 +172,7 @@ InputName=cbp_sse2 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) - + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build !ELSEIF "$(CFG)" == "libxvidcore - Win32 Debug" @@ -184,7 +183,7 @@ InputName=cbp_sse2 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -247,8 +246,7 @@ InputName=fdct_mmx_ffmpeg "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) - + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build !ELSEIF "$(CFG)" == "libxvidcore - Win32 Debug" @@ -259,7 +257,7 @@ InputName=fdct_mmx_ffmpeg "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -278,7 +276,7 @@ InputName=fdct_mmx_skal "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -290,7 +288,7 @@ InputName=fdct_mmx_skal "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -309,7 +307,7 @@ InputName=fdct_sse2_skal "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -321,7 +319,7 @@ InputName=fdct_sse2_skal "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -340,7 +338,7 @@ InputName=idct_3dne "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -352,7 +350,7 @@ InputName=idct_3dne "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -371,7 +369,7 @@ InputName=idct_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -383,7 +381,7 @@ InputName=idct_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -402,7 +400,7 @@ InputName=idct_sse2_dmitry "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -414,7 +412,7 @@ InputName=idct_sse2_dmitry "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -470,7 +468,7 @@ InputName=colorspace_rgb_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -I"$(InputDir)"\ -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ -I"$(InputDir)"\ "$(InputPath)" # End Custom Build @@ -483,7 +481,7 @@ InputName=colorspace_rgb_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -I"$(InputDir)"\ -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ -I"$(InputDir)"\ "$(InputPath)" # End Custom Build @@ -503,7 +501,7 @@ InputName=colorspace_yuv_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -I"$(InputDir)"\ -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ -I"$(InputDir)"\ "$(InputPath)" # End Custom Build @@ -516,7 +514,7 @@ InputName=colorspace_yuv_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -I"$(InputDir)"\ -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ -I"$(InputDir)"\ "$(InputPath)" # End Custom Build @@ -536,7 +534,7 @@ InputName=colorspace_yuyv_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -I"$(InputDir)"\ -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ -I"$(InputDir)"\ "$(InputPath)" # End Custom Build @@ -549,7 +547,7 @@ InputName=colorspace_yuyv_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -I"$(InputDir)"\ -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ -I"$(InputDir)"\ "$(InputPath)" # End Custom Build @@ -568,7 +566,7 @@ InputName=deintl_sse "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -580,7 +578,7 @@ InputName=deintl_sse "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -599,7 +597,7 @@ InputName=gmc_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -611,7 +609,7 @@ InputName=gmc_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -630,7 +628,7 @@ InputName=interpolate8x8_3dn "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -642,7 +640,7 @@ InputName=interpolate8x8_3dn "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -661,7 +659,7 @@ InputName=interpolate8x8_3dne "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -673,7 +671,7 @@ InputName=interpolate8x8_3dne "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -692,7 +690,7 @@ InputName=interpolate8x8_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -704,7 +702,7 @@ InputName=interpolate8x8_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -723,7 +721,7 @@ InputName=interpolate8x8_xmm "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -735,7 +733,7 @@ InputName=interpolate8x8_xmm "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -754,7 +752,7 @@ InputName=postprocessing_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -766,7 +764,7 @@ InputName=postprocessing_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -785,7 +783,7 @@ InputName=postprocessing_sse2 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -797,7 +795,7 @@ InputName=postprocessing_sse2 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -816,7 +814,7 @@ InputName=qpel_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -828,7 +826,7 @@ InputName=qpel_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -847,7 +845,7 @@ InputName=reduced_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -859,7 +857,7 @@ InputName=reduced_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -947,7 +945,7 @@ InputName=sad_3dn "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -959,7 +957,7 @@ InputName=sad_3dn "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -978,7 +976,7 @@ InputName=sad_3dne "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -990,7 +988,7 @@ InputName=sad_3dne "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -1009,7 +1007,7 @@ InputName=sad_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -1021,7 +1019,7 @@ InputName=sad_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -1040,7 +1038,7 @@ InputName=sad_sse2 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -1052,7 +1050,7 @@ InputName=sad_sse2 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -1071,7 +1069,7 @@ InputName=sad_xmm "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -1083,7 +1081,7 @@ InputName=sad_xmm "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -1190,7 +1188,7 @@ InputName=quantize_h263_3dne "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -1202,7 +1200,7 @@ InputName=quantize_h263_3dne "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -1221,7 +1219,7 @@ InputName=quantize_h263_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -1233,7 +1231,7 @@ InputName=quantize_h263_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -1252,7 +1250,7 @@ InputName=quantize_mpeg_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -1264,7 +1262,7 @@ InputName=quantize_mpeg_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -1283,7 +1281,7 @@ InputName=quantize_mpeg_xmm "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -1295,7 +1293,7 @@ InputName=quantize_mpeg_xmm "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -1346,7 +1344,7 @@ InputName=cpuid "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -1358,7 +1356,7 @@ InputName=cpuid "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -1377,7 +1375,7 @@ InputName=interlacing_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -1389,7 +1387,7 @@ InputName=interlacing_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -1408,7 +1406,7 @@ InputName=mem_transfer_3dne "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -1420,7 +1418,7 @@ InputName=mem_transfer_3dne "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -1439,7 +1437,7 @@ InputName=mem_transfer_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -1451,7 +1449,7 @@ InputName=mem_transfer_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -1554,7 +1552,7 @@ InputName=plugin_ssim-a "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -1566,7 +1564,7 @@ InputName=plugin_ssim-a "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/build/win32/libxvidcore.sln ^
@@ -1,4 +1,4 @@ - + Microsoft Visual Studio Solution File, Format Version 9.00 # Visual Studio 2005 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxvidcore", "libxvidcore.vcproj", "{64954A96-C813-4A92-87AD-DD733A5404AF}"
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/build/win32/libxvidcore_static.dsp ^
@@ -136,7 +136,7 @@ InputName=cbp_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -148,7 +148,7 @@ InputName=cbp_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -167,7 +167,7 @@ InputName=cbp_sse2 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -179,7 +179,7 @@ InputName=cbp_sse2 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -242,7 +242,7 @@ InputName=fdct_mmx_ffmpeg "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -254,7 +254,7 @@ InputName=fdct_mmx_ffmpeg "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -273,7 +273,7 @@ InputName=fdct_mmx_skal "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -285,7 +285,7 @@ InputName=fdct_mmx_skal "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -304,7 +304,7 @@ InputName=fdct_sse2_skal "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -316,7 +316,7 @@ InputName=fdct_sse2_skal "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -335,7 +335,7 @@ InputName=idct_3dne "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -347,7 +347,7 @@ InputName=idct_3dne "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -366,7 +366,7 @@ InputName=idct_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -378,7 +378,7 @@ InputName=idct_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -397,7 +397,7 @@ InputName=idct_sse2_dmitry "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -409,7 +409,7 @@ InputName=idct_sse2_dmitry "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -465,7 +465,7 @@ InputName=colorspace_rgb_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -I"$(InputDir)"\ -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ -I"$(InputDir)"\ "$(InputPath)" # End Custom Build @@ -478,7 +478,7 @@ InputName=colorspace_rgb_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -I"$(InputDir)"\ -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ -I"$(InputDir)"\ "$(InputPath)" # End Custom Build @@ -498,7 +498,7 @@ InputName=colorspace_yuv_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -I"$(InputDir)"\ -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ -I"$(InputDir)"\ "$(InputPath)" # End Custom Build @@ -511,7 +511,7 @@ InputName=colorspace_yuv_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -I"$(InputDir)"\ -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ -I"$(InputDir)"\ "$(InputPath)" # End Custom Build @@ -531,7 +531,7 @@ InputName=colorspace_yuyv_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -I"$(InputDir)"\ -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ -I"$(InputDir)"\ "$(InputPath)" # End Custom Build @@ -544,7 +544,7 @@ InputName=colorspace_yuyv_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -I"$(InputDir)"\ -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ -I"$(InputDir)"\ "$(InputPath)" # End Custom Build @@ -564,7 +564,7 @@ InputName=deintl_sse "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -I"$(InputDir)"\ -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -577,7 +577,7 @@ InputName=deintl_sse "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -I"$(InputDir)"\ -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -597,7 +597,7 @@ InputName=gmc_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -I"$(InputDir)"\ -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -610,7 +610,7 @@ InputName=gmc_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -I"$(InputDir)"\ -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -629,7 +629,7 @@ InputName=interpolate8x8_3dn "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -641,7 +641,7 @@ InputName=interpolate8x8_3dn "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -660,7 +660,7 @@ InputName=interpolate8x8_3dne "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -672,7 +672,7 @@ InputName=interpolate8x8_3dne "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -691,7 +691,7 @@ InputName=interpolate8x8_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -703,7 +703,7 @@ InputName=interpolate8x8_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -722,7 +722,7 @@ InputName=interpolate8x8_xmm "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -734,7 +734,7 @@ InputName=interpolate8x8_xmm "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -753,7 +753,7 @@ InputName=postprocessing_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -765,7 +765,7 @@ InputName=postprocessing_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -784,7 +784,7 @@ InputName=postprocessing_sse2 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -796,7 +796,7 @@ InputName=postprocessing_sse2 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -815,7 +815,7 @@ InputName=qpel_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -827,7 +827,7 @@ InputName=qpel_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -846,7 +846,7 @@ InputName=reduced_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -858,7 +858,7 @@ InputName=reduced_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -946,7 +946,7 @@ InputName=sad_3dn "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -958,7 +958,7 @@ InputName=sad_3dn "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -977,7 +977,7 @@ InputName=sad_3dne "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -989,7 +989,7 @@ InputName=sad_3dne "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -1008,7 +1008,7 @@ InputName=sad_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -1020,7 +1020,7 @@ InputName=sad_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -1039,7 +1039,7 @@ InputName=sad_sse2 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -1051,7 +1051,7 @@ InputName=sad_sse2 "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -1070,7 +1070,7 @@ InputName=sad_xmm "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -1082,7 +1082,7 @@ InputName=sad_xmm "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -1189,7 +1189,7 @@ InputName=quantize_h263_3dne "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -1201,7 +1201,7 @@ InputName=quantize_h263_3dne "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -1220,7 +1220,7 @@ InputName=quantize_h263_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -1232,7 +1232,7 @@ InputName=quantize_h263_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -1251,7 +1251,7 @@ InputName=quantize_mpeg_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -1263,7 +1263,7 @@ InputName=quantize_mpeg_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -1282,7 +1282,7 @@ InputName=quantize_mpeg_xmm "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -1294,7 +1294,7 @@ InputName=quantize_mpeg_xmm "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -1345,7 +1345,7 @@ InputName=cpuid "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -1357,7 +1357,7 @@ InputName=cpuid "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -1376,7 +1376,7 @@ InputName=interlacing_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -1388,7 +1388,7 @@ InputName=interlacing_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -1407,7 +1407,7 @@ InputName=mem_transfer_3dne "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -1419,7 +1419,7 @@ InputName=mem_transfer_3dne "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -1438,7 +1438,7 @@ InputName=mem_transfer_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -1450,7 +1450,7 @@ InputName=mem_transfer_mmx "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -1553,7 +1553,7 @@ InputName=plugin_ssim-a "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build @@ -1565,7 +1565,7 @@ InputName=plugin_ssim-a "$(IntDir)\$(InputName).obj" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - nasm -I"../../src/" -f win32 -DWINDOWS -o $(IntDir)\$(InputName).obj $(InputPath) + nasm -o "$(IntDir)\$(InputName).obj" -f win32 -DWINDOWS -I..\..\src\ "$(InputPath)" # End Custom Build
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/debian/changelog ^
@@ -1,3 +1,9 @@ +xvidcore (1.2.2-1) stable; urgency=low + + * New upstream release + + -- Michael Militzer <michael@xvid.org> Thu, 28 May 2009 17:46:26 +0100 + xvidcore (1.2.1-1) stable; urgency=low * New upstream release
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/debian/control ^
@@ -2,7 +2,7 @@ Section: libs Priority: optional Maintainer: Edouard Gomez <ed.gomez@free.fr> -Build-Depends: debhelper (>= 5), nasm (>= 2.0.0) [i386] +Build-Depends: debhelper (>= 5), nasm (>= 2.0.0) [i386 amd64] Standards-Version: 3.5.8 Package: libxvidcore4
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/doc/README ^
@@ -7,4 +7,11 @@ This file describes the steps to build and install XviD on supported platforms. -Last edited: $Date: 2004/03/22 22:36:23 $ +NOTE FOR MacOS X PLATFORM +------------------------- + +Many versions of nasm are known to be buggy for Mach-O output. + +* nasm 2.06rc2 or later is required for Mac OS X build * + +Last edited: $Date: 2009/05/25 09:25:50 $
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/dshow/src/CXvidDecoder.cpp ^
@@ -19,7 +19,7 @@ * along with this program ; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: CXvidDecoder.cpp,v 1.16 2005/10/08 00:58:02 suxen_drol Exp $ + * $Id: CXvidDecoder.cpp,v 1.16.4.1 2009/05/28 15:52:34 Isibaar Exp $ * **************************************************************************/ @@ -419,7 +419,7 @@ return E_FAIL; if (xvid_decore_func(0, XVID_DEC_CREATE, &m_create, 0) < 0) { DPRINTF("* XVID_DEC_CREATE error"); - return S_FALSE; + return E_FAIL; } } @@ -428,14 +428,15 @@ m_frame.length = mpgvi->cbSequenceHeader; m_frame.output.csp = XVID_CSP_NULL; - if (xvid_decore_func(m_create.handle, XVID_DEC_DECODE, &m_frame, &stats) >= 0) { + int ret = 0; + if ((ret=xvid_decore_func(m_create.handle, XVID_DEC_DECODE, &m_frame, &stats)) >= 0) { /* honour video dimensions reported in VOL header / if (stats.type == XVID_TYPE_VOL) { hdr->biWidth = stats.data.vol.width; hdr->biHeight = stats.data.vol.height; } } - + if (ret == XVID_ERR_MEMORY) return E_FAIL; } } else @@ -795,7 +796,7 @@ if (xvid_decore_func(0, XVID_DEC_CREATE, &m_create, 0) < 0) { DPRINTF(" XVID_DEC_CREATE error"); - return S_FALSE; + return E_FAIL; } } @@ -862,8 +863,10 @@ if (pIn->IsPreroll() != S_OK) { length = xvid_decore_func(m_create.handle, XVID_DEC_DECODE, &m_frame, &stats); - - if (length < 0) + + if (length == XVID_ERR_MEMORY) + return E_FAIL; + else if (length < 0) { DPRINTF("* XVID_DEC_DECODE"); return S_FALSE; @@ -907,7 +910,9 @@ m_frame.general &= ~XVID_FILMEFFECT; length = xvid_decore_func(m_create.handle, XVID_DEC_DECODE, &m_frame, &stats); - if (length < 0) + if (length == XVID_ERR_MEMORY) + return E_FAIL; + else if (length < 0) { DPRINTF("*** XVID_DEC_DECODE"); return S_FALSE;
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/src/bitstream/x86_asm/cbp_mmx.asm ^
@@ -21,7 +21,7 @@ ; * along with this program ; if not, write to the Free Software ; * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ; * -; * $Id: cbp_mmx.asm,v 1.17 2008/11/26 01:04:34 Isibaar Exp $ +; * $Id: cbp_mmx.asm,v 1.17.2.1 2009/05/28 08:42:37 Isibaar Exp $ ; * ; ***************************************************************************/ @@ -48,7 +48,7 @@ ; Code ;============================================================================= -SECTION .rotext align=SECTION_ALIGN +TEXT cglobal calc_cbp_mmx
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/src/bitstream/x86_asm/cbp_sse2.asm ^
@@ -20,7 +20,7 @@ ; * along with this program ; if not, write to the Free Software ; * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ; * -; * $Id: cbp_sse2.asm,v 1.10.2.1 2008/12/01 17:27:03 Isibaar Exp $ +; * $Id: cbp_sse2.asm,v 1.10.2.2 2009/05/28 08:42:37 Isibaar Exp $ ; * ; **************************************************************************/ @@ -64,7 +64,7 @@ ; Code ;============================================================================= -SECTION .rotext align=SECTION_ALIGN +TEXT ;----------------------------------------------------------------------------- ; uint32_t calc_cbp_sse2(const int16_t coeff[664]);
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/src/dct/ia64_asm/fdct_ia64.s ^
@@ -1,47 +1,48 @@ -// ****************************************************************************** -// * * -// * This file is part of XviD, a free MPEG-4 video encoder/decoder * -// * * -// * * -// * XviD is free software; you can redistribute it and/or modify it * -// * under the terms of the GNU General Public License as published by * -// * the Free Software Foundation; either version 2 of the License, or * -// * (at your option) any later version. * -// * * -// * XviD is distributed in the hope that it will be useful, but * -// * WITHOUT ANY WARRANTY; without even the implied warranty of * -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * -// * GNU General Public License for more details. * -// * * -// * You should have received a copy of the GNU General Public License * -// * along with this program; if not, write to the Free Software * -// * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * -// * * -// **************************************************************************** +// ************************************************************************** +// * +// * XVID MPEG-4 VIDEO CODEC +// * - IA64 forward discrete cosine transform - +// * +// * Copyright(C) 2002 Stephan Krause, Ingo-Marc Weber, Daniel Kallfass +// * +// * This program is free software; you can redistribute it and/or modify it +// * under the terms of the GNU General Public License as published by +// * the Free Software Foundation; either version 2 of the License, or +// * (at your option) any later version. +// * +// * This program is distributed in the hope that it will be useful, +// * but WITHOUT ANY WARRANTY; without even the implied warranty of +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * GNU General Public License for more details. +// * +// * You should have received a copy of the GNU General Public License +// * along with this program; if not, write to the Free Software +// * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// * +// * $Id: fdct_ia64.s,v 1.5.10.1 2009/05/25 09:03:47 Isibaar Exp $ +// * +// *************************************************************************/ // -// **************************************************************************** -// * * -// * fdct_ia64.s, IA-64 optimized forward DCT * -// * * -// * Completed version provided by Intel at AppNote AP-922 * -// * http://developer.intel.com/software/products/college/ia32/strmsimd/ * -// * Copyright (C) 1999 Intel Corporation, * -// * * -// * This version was implemented during an IA-64 practical training at * -// * the University of Karlsruhe (http://i44w3.info.uni-karlsruhe.de/) * -// * Copyright (C) 2002 - Stephan Krause, Ingo-Marc Weber, Daniel Kallfass * -// * * -// * For more information visit the XviD homepage: http://www.xvid.org * -// * * -// **************************************************************************** +// ************************************************************************** +// * +// * fdct_ia64.s, IA-64 optimized forward DCT +// * +// * Completed version provided by Intel at AppNote AP-922 +// * http://developer.intel.com/software/products/college/ia32/strmsimd/ +// * Copyright (C) 1999 Intel Corporation, +// * +// * This version was implemented during an IA-64 practical training at +// * the University of Karlsruhe (http://i44w3.info.uni-karlsruhe.de/) +// * +// *************************************************************************** // -// **************************************************************************** -// * * -// * Revision history: * -// * * -// * 24.07.2002 Initial Version * -// * * -// **************************************************************************** +// *************************************************************************** +// * +// * Revision history: +// * +// * 24.07.2002 Initial Version +// * +// ***************************************************************************** // This is a fast precise implementation of 8x8 Discrete Cosine Transform
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/src/dct/ia64_asm/idct_fini.s ^
@@ -1,3 +1,37 @@ +// **************************************************************************** +// * +// * XVID MPEG-4 VIDEO CODEC +// * - IA64 inverse discrete cosine transform - +// * +// * Copyright(C) 2002 Christian Schwarz, Haiko Gaisser, Sebastian Hack +// * +// * This program is free software; you can redistribute it and/or modify it +// * under the terms of the GNU General Public License as published by +// * the Free Software Foundation; either version 2 of the License, or +// * (at your option) any later version. +// * +// * This program is distributed in the hope that it will be useful, +// * but WITHOUT ANY WARRANTY; without even the implied warranty of +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * GNU General Public License for more details. +// * +// * You should have received a copy of the GNU General Public License +// * along with this program; if not, write to the Free Software +// * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// * +// * $Id: idct_fini.s,v 1.1.14.1 2009/05/25 09:03:47 Isibaar Exp $ +// * +// *************************************************************************/ +// +// ************************************************************************** +// * +// * idct_fini.s, IA-64 optimized inverse DCT +// * +// * This version was implemented during an IA-64 practical training at +// * the University of Karlsruhe (http://i44w3.info.uni-karlsruhe.de/) +// * +// **************************************************************************** +// mov ar.pfs = r16 br.ret.sptk.few b0
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/src/dct/ia64_asm/idct_ia64_ecc.s ^
@@ -1,3 +1,38 @@ +// **************************************************************************** +// * +// * XVID MPEG-4 VIDEO CODEC +// * - IA64 inverse discrete cosine transform - +// * +// * Copyright(C) 2002 Christian Schwarz, Haiko Gaisser, Sebastian Hack +// * +// * This program is free software; you can redistribute it and/or modify it +// * under the terms of the GNU General Public License as published by +// * the Free Software Foundation; either version 2 of the License, or +// * (at your option) any later version. +// * +// * This program is distributed in the hope that it will be useful, +// * but WITHOUT ANY WARRANTY; without even the implied warranty of +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * GNU General Public License for more details. +// * +// * You should have received a copy of the GNU General Public License +// * along with this program; if not, write to the Free Software +// * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// * +// * $Id: idct_ia64_ecc.s,v 1.1.14.1 2009/05/25 09:03:47 Isibaar Exp $ +// * +// *************************************************************************/ +// +// ************************************************************************** +// * +// * idct_ia64_ecc.s, IA-64 optimized inverse DCT +// * +// * This version was implemented during an IA-64 practical training at +// * the University of Karlsruhe (http://i44w3.info.uni-karlsruhe.de/) +// * +// **************************************************************************** +// + addreg1 = r14 addreg2 = r15 c0 = f32
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/src/dct/ia64_asm/idct_ia64_gcc.s ^
@@ -1,3 +1,38 @@ +// **************************************************************************** +// * +// * XVID MPEG-4 VIDEO CODEC +// * - IA64 inverse discrete cosine transform - +// * +// * Copyright(C) 2002 Christian Schwarz, Haiko Gaisser, Sebastian Hack +// * +// * This program is free software; you can redistribute it and/or modify it +// * under the terms of the GNU General Public License as published by +// * the Free Software Foundation; either version 2 of the License, or +// * (at your option) any later version. +// * +// * This program is distributed in the hope that it will be useful, +// * but WITHOUT ANY WARRANTY; without even the implied warranty of +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * GNU General Public License for more details. +// * +// * You should have received a copy of the GNU General Public License +// * along with this program; if not, write to the Free Software +// * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// * +// * $Id: idct_ia64_gcc.s,v 1.1.14.1 2009/05/25 09:03:47 Isibaar Exp $ +// * +// *************************************************************************/ +// +// ************************************************************************** +// * +// * idct_ia64_gcc.s, IA-64 optimized inverse DCT +// * +// * This version was implemented during an IA-64 practical training at +// * the University of Karlsruhe (http://i44w3.info.uni-karlsruhe.de/) +// * +// **************************************************************************** +// + addreg1 = r14 addreg2 = r15 c0 = f32
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/src/dct/ia64_asm/idct_init.s ^
@@ -1,3 +1,37 @@ +// **************************************************************************** +// * +// * XVID MPEG-4 VIDEO CODEC +// * - IA64 inverse discrete cosine transform - +// * +// * Copyright(C) 2002 Christian Schwarz, Haiko Gaisser, Sebastian Hack +// * +// * This program is free software; you can redistribute it and/or modify it +// * under the terms of the GNU General Public License as published by +// * the Free Software Foundation; either version 2 of the License, or +// * (at your option) any later version. +// * +// * This program is distributed in the hope that it will be useful, +// * but WITHOUT ANY WARRANTY; without even the implied warranty of +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * GNU General Public License for more details. +// * +// * You should have received a copy of the GNU General Public License +// * along with this program; if not, write to the Free Software +// * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// * +// * $Id: idct_init.s,v 1.1.14.1 2009/05/25 09:03:47 Isibaar Exp $ +// * +// *************************************************************************/ +// +// ************************************************************************** +// * +// * idct_init.s, IA-64 optimized inverse DCT +// * +// * This version was implemented during an IA-64 practical training at +// * the University of Karlsruhe (http://i44w3.info.uni-karlsruhe.de/) +// * +// **************************************************************************** +// addreg3 = r20 addreg4 = r21
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/src/dct/x86_asm/fdct_mmx_ffmpeg.asm ^
@@ -19,7 +19,7 @@ ; * along with this program; if not, write to the Free Software ; * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ; * -; * $Id: fdct_mmx_ffmpeg.asm,v 1.8 2008/11/26 01:04:34 Isibaar Exp $ +; * $Id: fdct_mmx_ffmpeg.asm,v 1.8.2.1 2009/05/28 08:42:37 Isibaar Exp $ ; * ; ***************************************************************************/ @@ -387,7 +387,7 @@ ; Code ;============================================================================= -SECTION .rotext align=SECTION_ALIGN +TEXT ;----------------------------------------------------------------------------- ; void fdct_mmx_ffmpeg(int16_t block[64]);
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/src/dct/x86_asm/fdct_mmx_skal.asm ^
@@ -19,7 +19,7 @@ ; * along with this program; if not, write to the Free Software ; * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ; * -; * $Id: fdct_mmx_skal.asm,v 1.10 2008/11/26 01:04:34 Isibaar Exp $ +; * $Id: fdct_mmx_skal.asm,v 1.10.2.1 2009/05/28 08:42:37 Isibaar Exp $ ; * ; ***************************************************************************/ @@ -486,7 +486,7 @@ ; Code ;============================================================================= -SECTION .rotext align=SECTION_ALIGN +TEXT ;----------------------------------------------------------------------------- ; void fdct_mmx_skal(int16_t block[64]];
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/src/dct/x86_asm/fdct_sse2_skal.asm ^
@@ -19,7 +19,7 @@ ; * along with this program; if not, write to the Free Software ; * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ; * -; * $Id: fdct_sse2_skal.asm,v 1.10.2.1 2008/12/01 17:27:03 Isibaar Exp $ +; * $Id: fdct_sse2_skal.asm,v 1.10.2.3 2009/05/28 08:42:37 Isibaar Exp $ ; * ; ***************************************************************************/ @@ -195,7 +195,7 @@ ; Code ;============================================================================= -SECTION .rotext align=SECTION_ALIGN +TEXT cglobal idct_sse2_skal cglobal fdct_sse2_skal @@ -604,6 +604,9 @@ ret ENDFUNC +; Mac-specific workaround for misaligned DCT tables +ALIGN SECTION_ALIGN + times 8 dw 0 %ifidn __OUTPUT_FORMAT__,elf section ".note.GNU-stack" noalloc noexec nowrite progbits
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/src/dct/x86_asm/idct_3dne.asm ^
@@ -20,7 +20,7 @@ ; * along with this program; if not, write to the Free Software ; * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ; * -; * $Id: idct_3dne.asm,v 1.9 2008/11/26 01:04:34 Isibaar Exp $ +; * $Id: idct_3dne.asm,v 1.9.2.1 2009/05/28 08:42:37 Isibaar Exp $ ; * ; ***************************************************************************/ @@ -199,7 +199,7 @@ ; Code ;============================================================================= -SECTION .rotext align=SECTION_ALIGN +TEXT cglobal idct_3dne
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/src/dct/x86_asm/idct_mmx.asm ^
@@ -19,7 +19,7 @@ ; * along with this program; if not, write to the Free Software ; * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ; * -; * $Id: idct_mmx.asm,v 1.13 2008/11/26 01:04:34 Isibaar Exp $ +; * $Id: idct_mmx.asm,v 1.13.2.1 2009/05/28 08:42:37 Isibaar Exp $ ; * ; ***************************************************************************/ @@ -553,7 +553,7 @@ ; Code ;============================================================================= -SECTION .rotext align=SECTION_ALIGN +TEXT cglobal idct_mmx cglobal idct_xmm
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/src/dct/x86_asm/idct_sse2_dmitry.asm ^
@@ -19,7 +19,7 @@ ; * along with this program; if not, write to the Free Software ; * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ; * -; * $Id: idct_sse2_dmitry.asm,v 1.8.2.1 2008/12/01 17:27:03 Isibaar Exp $ +; * $Id: idct_sse2_dmitry.asm,v 1.8.2.2 2009/05/28 08:42:37 Isibaar Exp $ ; * ; ***************************************************************************/ @@ -145,7 +145,7 @@ ; Code ;============================================================================= -SECTION .rotext align=SECTION_ALIGN +TEXT cglobal idct_sse2_dmitry
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/src/decoder.c ^
@@ -20,7 +20,7 @@ * along with this program ; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: decoder.c,v 1.80 2007/04/16 19:01:28 Skal Exp $ + * $Id: decoder.c,v 1.80.2.1 2009/05/28 15:52:34 Isibaar Exp $ * ***************************************************************************/ @@ -201,8 +201,11 @@ dec->fixed_dimensions = (dec->width > 0 && dec->height > 0); - if (dec->fixed_dimensions) - return decoder_resize(dec); + if (dec->fixed_dimensions) { + int ret = decoder_resize(dec); + if (ret == XVID_ERR_MEMORY) create->handle = NULL; + return ret; + } else return 0; } @@ -748,7 +751,7 @@ bound = read_video_packet_header(bs, dec, 0, &quant, NULL, NULL, &intra_dc_threshold); x = bound % mb_width; - y = bound / mb_width; + y = MIN((bound / mb_width), (mb_height-1)); } mb = &dec->mbs[y dec->mb_width + x]; @@ -975,7 +978,7 @@ bound = read_video_packet_header(bs, dec, fcode - 1, &quant, &fcode, NULL, &intra_dc_threshold); x = bound % mb_width; - y = bound / mb_width; + y = MIN((bound / mb_width), (mb_height-1)); } mb = &dec->mbs[y * dec->mb_width + x]; @@ -1384,7 +1387,7 @@ int bound = read_video_packet_header(bs, dec, resync_len, &quant, &fcode_forward, &fcode_backward, &intra_dc_threshold); x = bound % dec->mb_width; - y = bound / dec->mb_width; + y = MIN((bound / dec->mb_width), (dec->mb_height-1)); /* reset predicted macroblocks / dec->p_fmv = dec->p_bmv = zeromv; / update resync len with new fcodes */
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/src/image/colorspace.c ^
@@ -19,7 +19,7 @@ * along with this program ; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: colorspace.c,v 1.14 2006/11/10 18:58:39 chl Exp $ + * $Id: colorspace.c,v 1.14.2.1 2009/05/25 08:31:15 Isibaar Exp $ * ***************************************************************************/ @@ -152,9 +152,9 @@ #define V_B_IN 0.071 #define V_ADD_IN 128 -#define SCALEBITS_IN 8 +#define SCALEBITS_IN 13 #define FIX_IN(x) ((uint16_t) ((x) (1L<<SCALEBITS_IN) + 0.5)) - +#define FIX_ROUND (1L<<(SCALEBITS_IN-1)) /* rgb16/rgb16i input / @@ -174,22 +174,22 @@ r##UVID += r = C1##_R(rgb); \ y_ptr[(ROW)y_stride+0] = \ (uint8_t) ((FIX_IN(Y_R_IN) * r + FIX_IN(Y_G_IN) * g + \ - FIX_IN(Y_B_IN) * b) >> SCALEBITS_IN) + Y_ADD_IN; \ + FIX_IN(Y_B_IN) * b + FIX_ROUND) >> SCALEBITS_IN) + Y_ADD_IN; \ rgb = (uint16_t ) (x_ptr + ((ROW)x_stride) + 2); \ b##UVID += b = C1##_B(rgb); \ g##UVID += g = C1##_G(rgb); \ r##UVID += r = C1##_R(rgb); \ y_ptr[(ROW)y_stride+1] = \ (uint8_t) ((FIX_IN(Y_R_IN) * r + FIX_IN(Y_G_IN) * g + \ - FIX_IN(Y_B_IN) * b) >> SCALEBITS_IN) + Y_ADD_IN; + FIX_IN(Y_B_IN) * b + FIX_ROUND) >> SCALEBITS_IN) + Y_ADD_IN; #define READ_RGB16_UV(UV_ROW,UVID) \ u_ptr[(UV_ROW)uv_stride] = \ (uint8_t) ((-FIX_IN(U_R_IN) r##UVID - FIX_IN(U_G_IN) * g##UVID + \ - FIX_IN(U_B_IN) * b##UVID) >> (SCALEBITS_IN + 2)) + U_ADD_IN; \ + FIX_IN(U_B_IN) * b##UVID + 4FIX_ROUND) >> (SCALEBITS_IN + 2)) + U_ADD_IN; \ v_ptr[(UV_ROW)uv_stride] = \ (uint8_t) ((FIX_IN(V_R_IN) * r##UVID - FIX_IN(V_G_IN) * g##UVID - \ - FIX_IN(V_B_IN) * b##UVID) >> (SCALEBITS_IN + 2)) + V_ADD_IN; + FIX_IN(V_B_IN) * b##UVID + 4FIX_ROUND) >> (SCALEBITS_IN + 2)) + V_ADD_IN; #define RGB16_TO_YV12_ROW(SIZE,C1,C2,C3,C4) \ / nothing / @@ -222,21 +222,21 @@ b##UVID += b = x_ptr[(ROW)x_stride+(C3)]; \ y_ptr[(ROW)y_stride+0] = \ (uint8_t) ((FIX_IN(Y_R_IN) r + FIX_IN(Y_G_IN) * g + \ - FIX_IN(Y_B_IN) * b) >> SCALEBITS_IN) + Y_ADD_IN; \ + FIX_IN(Y_B_IN) * b + FIX_ROUND) >> SCALEBITS_IN) + Y_ADD_IN; \ r##UVID += r = x_ptr[(ROW)x_stride+(SIZE)+(C1)]; \ g##UVID += g = x_ptr[(ROW)x_stride+(SIZE)+(C2)]; \ b##UVID += b = x_ptr[(ROW)x_stride+(SIZE)+(C3)]; \ y_ptr[(ROW)y_stride+1] = \ (uint8_t) ((FIX_IN(Y_R_IN) * r + FIX_IN(Y_G_IN) * g + \ - FIX_IN(Y_B_IN) * b) >> SCALEBITS_IN) + Y_ADD_IN; + FIX_IN(Y_B_IN) * b + FIX_ROUND) >> SCALEBITS_IN) + Y_ADD_IN; #define READ_RGB_UV(UV_ROW,UVID) \ u_ptr[(UV_ROW)uv_stride] = \ (uint8_t) ((-FIX_IN(U_R_IN) r##UVID - FIX_IN(U_G_IN) * g##UVID + \ - FIX_IN(U_B_IN) * b##UVID) >> (SCALEBITS_IN + 2)) + U_ADD_IN; \ + FIX_IN(U_B_IN) * b##UVID + 4FIX_ROUND) >> (SCALEBITS_IN + 2)) + U_ADD_IN; \ v_ptr[(UV_ROW)uv_stride] = \ (uint8_t) ((FIX_IN(V_R_IN) * r##UVID - FIX_IN(V_G_IN) * g##UVID - \ - FIX_IN(V_B_IN) * b##UVID) >> (SCALEBITS_IN + 2)) + V_ADD_IN; + FIX_IN(V_B_IN) * b##UVID + 4FIX_ROUND) >> (SCALEBITS_IN + 2)) + V_ADD_IN; #define RGB_TO_YV12_ROW(SIZE,C1,C2,C3,C4) \ @@ -326,7 +326,7 @@ #define R_V_OUT 1.596 #define V_ADD_OUT 128 -#define SCALEBITS_OUT 13 +#define SCALEBITS_OUT 13 #define FIX_OUT(x) ((uint16_t) ((x) (1L<<SCALEBITS_OUT) + 0.5))
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/src/image/ia64_asm/interpolate8x8_ia64.s ^
@@ -1,3 +1,36 @@ +// **************************************************************************** +// * +// * XVID MPEG-4 VIDEO CODEC +// * - IA64 halfpel interpolation - +// * +// * Copyright(C) 2002 Kai Kühn, Alexander Viehl +// * +// * This program is free software; you can redistribute it and/or modify it +// * under the terms of the GNU General Public License as published by +// * the Free Software Foundation; either version 2 of the License, or +// * (at your option) any later version. +// * +// * This program is distributed in the hope that it will be useful, +// * but WITHOUT ANY WARRANTY; without even the implied warranty of +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * GNU General Public License for more details. +// * +// * You should have received a copy of the GNU General Public License +// * along with this program; if not, write to the Free Software +// * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// * +// * $Id: interpolate8x8_ia64.s,v 1.5.14.1 2009/05/25 09:03:47 Isibaar Exp $ +// * +// *************************************************************************/ +// +// ************************************************************************** +// * +// * interpolate8x8_ia64.s, IA-64 halfpel interpolation +// * +// * This version was implemented during an IA-64 practical training at +// * the University of Karlsruhe (http://i44w3.info.uni-karlsruhe.de/) +// * +// **************************************************************************** .file "interpolate8x8_ia64.s" .pred.safe_across_calls p1-p5,p16-p63
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/src/image/ia64_asm/interpolate8x8_ia64_exact.s ^
@@ -1,3 +1,37 @@ +// **************************************************************************** +// * +// * XVID MPEG-4 VIDEO CODEC +// * - IA64 halfpel interpolation - +// * +// * Copyright(C) 2002 Kai Kühn, Alexander Viehl +// * +// * This program is free software; you can redistribute it and/or modify it +// * under the terms of the GNU General Public License as published by +// * the Free Software Foundation; either version 2 of the License, or +// * (at your option) any later version. +// * +// * This program is distributed in the hope that it will be useful, +// * but WITHOUT ANY WARRANTY; without even the implied warranty of +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * GNU General Public License for more details. +// * +// * You should have received a copy of the GNU General Public License +// * along with this program; if not, write to the Free Software +// * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// * +// * $Id: interpolate8x8_ia64_exact.s,v 1.1.14.1 2009/05/25 09:03:47 Isibaar Exp $ +// * +// *************************************************************************/ +// +// ************************************************************************** +// * +// * interpolate8x8_ia64_exact.s, IA-64 halfpel interpolation +// * +// * This version was implemented during an IA-64 practical training at +// * the University of Karlsruhe (http://i44w3.info.uni-karlsruhe.de/) +// * +// ************************************************************************** + // ********************************* // interpolate8x8_ia64.s // optimized for IA-64
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/src/image/image.c ^
@@ -19,7 +19,7 @@ * along with this program ; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: image.c,v 1.43 2008/11/28 10:58:07 Isibaar Exp $ + * $Id: image.c,v 1.43.2.1 2009/05/25 08:31:16 Isibaar Exp $ * ***************************************************************************/ @@ -390,15 +390,20 @@ { int width_opt, width_c, height_opt; - if (width==1 \|\| height==1) return; / forget about it / + if (width<0 \|\| width==1 \|\| height==1) return; / forget about it / if (func_opt != func_c && x_stride < size((width+15)/16)16) { width_opt = width & (~15); width_c = (width - width_opt) & (~1); } - else + else if (func_opt != func_c && !(width&1) && (size==3)) { + / MMX reads 4 bytes per pixel for RGB/BGR / + width_opt = width - 2; + width_c = 2; + } + else { / Enforce the width to be divisable by two. */ width_opt = width & (~1); width_c = 0;
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/src/image/x86_asm/colorspace_mmx.inc ^
@@ -1,3 +1,27 @@ +;/***************************************************************************** +; * +; * XVID MPEG-4 VIDEO CODEC +; * - colorspace conversions - +; * +; * Copyright(C) 2002-2003 Peter Ross <pross@xvid.org> +; * 2008 Michael Militzer <michael@xvid.org> +; * +; * This program is free software ; you can redistribute it and/or modify +; * it under the terms of the GNU General Public License as published by +; * the Free Software Foundation ; either version 2 of the License, or +; * (at your option) any later version. +; * +; * This program is distributed in the hope that it will be useful, +; * but WITHOUT ANY WARRANTY ; without even the implied warranty of +; * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +; * GNU General Public License for more details. +; * +; * You should have received a copy of the GNU General Public License +; * along with this program ; if not, write to the Free Software +; * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +; * +; ****************************************************************************/ + ;------------------------------------------------------------------------------ ; ; MAKE_COLORSPACE(NAME,STACK, BYTES,PIXELS,ROWS, FUNC, ARG1)
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/src/image/x86_asm/colorspace_rgb_mmx.asm ^
@@ -48,7 +48,10 @@ %define V_ADD 128 ; Scaling used during conversion -%define SCALEBITS 6 +%define SCALEBITS_OUT 6 +%define SCALEBITS_IN 13 + +%define FIX_ROUND (1<<(SCALEBITS_IN-1)) ;============================================================================= ; Read only data @@ -63,18 +66,18 @@ ;----------------------------------------------------------------------------- ; FIX(Y_B) FIX(Y_G) FIX(Y_R) Ignored -bgr_y_mul: dw 25, 129, 66, 0 -bgr_u_mul: dw 112, -74, -38, 0 -bgr_v_mul: dw -18, -94, 112, 0 +bgr_y_mul: dw 803, 4129, 2105, 0 +bgr_u_mul: dw 3596, -2384, -1212, 0 +bgr_v_mul: dw -582, -3015, 3596, 0 ;----------------------------------------------------------------------------- ; BGR->YV12 multiplication matrices ;----------------------------------------------------------------------------- ; FIX(Y_R) FIX(Y_G) FIX(Y_B) Ignored -rgb_y_mul: dw 66, 129, 25, 0 -rgb_u_mul: dw -38, -74, 112, 0 -rgb_v_mul: dw 112, -94, -18, 0 +rgb_y_mul: dw 2105, 4129, 803, 0 +rgb_u_mul: dw -1212, -2384, 3596, 0 +rgb_v_mul: dw 3596, -3015, -582, 0 ;----------------------------------------------------------------------------- ; YV12->RGB data @@ -151,22 +154,26 @@ push x_stride movd x_stride_d, mm0 - shr x_stride, 8 + add x_stride, FIX_ROUND + shr x_stride, SCALEBITS_IN add x_stride, Y_ADD mov [y_ptr], dl ; y_ptr[0] movd x_stride_d, mm1 - shr x_stride, 8 + add x_stride, FIX_ROUND + shr x_stride, SCALEBITS_IN add x_stride, Y_ADD mov [y_ptr + 1], dl ; y_ptr[1] movd x_stride_d, mm2 - shr x_stride, 8 + add x_stride, FIX_ROUND + shr x_stride, SCALEBITS_IN add x_stride, Y_ADD mov [y_ptr + y_stride + 0], dl ; y_ptr[y_stride + 0] movd x_stride_d, mm3 - shr x_stride, 8 + add x_stride, FIX_ROUND + shr x_stride, SCALEBITS_IN add x_stride, Y_ADD mov [y_ptr + y_stride + 1], dl ; y_ptr[y_stride + 1] @@ -182,12 +189,14 @@ paddd mm2, mm6 movd x_stride_d, mm0 - shr x_stride, 10 + add x_stride, 4FIX_ROUND + shr x_stride, (SCALEBITS_IN+2) add x_stride, U_ADD mov [u_ptr], dl movd x_stride_d, mm2 - shr x_stride, 10 + add x_stride, 4FIX_ROUND + shr x_stride, (SCALEBITS_IN+2) add x_stride, V_ADD mov [v_ptr], dl @@ -246,22 +255,26 @@ push x_stride movd x_stride_d, mm0 - shr x_stride, 8 + add x_stride, FIX_ROUND + shr x_stride, SCALEBITS_IN add x_stride, Y_ADD mov [y_ptr], dl ; y_ptr[0] movd x_stride_d, mm1 - shr x_stride, 8 + add x_stride, FIX_ROUND + shr x_stride, SCALEBITS_IN add x_stride, Y_ADD mov [y_ptr + 1], dl ; y_ptr[1] movd x_stride_d, mm2 - shr x_stride, 8 + add x_stride, FIX_ROUND + shr x_stride, SCALEBITS_IN add x_stride, Y_ADD mov [y_ptr + y_stride + 0], dl ; y_ptr[y_stride + 0] movd x_stride_d, mm3 - shr x_stride, 8 + add x_stride, FIX_ROUND + shr x_stride, SCALEBITS_IN add x_stride, Y_ADD mov [y_ptr + y_stride + 1], dl ; y_ptr[y_stride + 1] @@ -277,12 +290,14 @@ paddd mm2, mm6 movd x_stride_d, mm0 - shr x_stride, 10 + add x_stride, 4FIX_ROUND + shr x_stride, (SCALEBITS_IN+2) add x_stride, U_ADD mov [u_ptr], dl movd x_stride_d, mm2 - shr x_stride, 10 + add x_stride, 4FIX_ROUND + shr x_stride, (SCALEBITS_IN+2) add x_stride, V_ADD mov [v_ptr], dl @@ -341,8 +356,8 @@ movq [TEMP_Y1], mm0 ; y3y2y1y0 -> mm7 psubsw mm1, mm2 ; g7g6g5g4 -> mm1 psubsw mm0, mm6 ; g3g2g1g0 -> mm0 - psraw mm1, SCALEBITS - psraw mm0, SCALEBITS + psraw mm1, SCALEBITS_OUT + psraw mm0, SCALEBITS_OUT packuswb mm0, mm1 ;g7g6g5g4g3g2g1g0 -> mm0 movq [TEMP_G1], mm0 movq mm0, [y_ptr+y_stride] ; y7y6y5y4y3y2y1y0 -> mm0 @@ -357,8 +372,8 @@ psubsw mm1, mm2 ; g7g6g5g4 -> mm1 movq mm2, mm0 psubsw mm0, mm6 ; g3g2g1g0 -> mm0 - psraw mm1, SCALEBITS - psraw mm0, SCALEBITS + psraw mm1, SCALEBITS_OUT + psraw mm0, SCALEBITS_OUT packuswb mm0, mm1 ; g7g6g5g4g3g2g1g0 -> mm0 movq [TEMP_G2], mm0 movq mm0, mm4 @@ -368,8 +383,8 @@ paddsw mm3, mm4 ; b7b6b5b4 -> mm3 movq mm7, mm2 ; y3y2y1y0 -> mm7 paddsw mm2, mm0 ; b3b2b1b0 -> mm2 - psraw mm3, SCALEBITS - psraw mm2, SCALEBITS + psraw mm3, SCALEBITS_OUT + psraw mm2, SCALEBITS_OUT packuswb mm2, mm3 ; b7b6b5b4b3b2b1b0 -> mm2 movq [TEMP_B2], mm2 movq mm3, [TEMP_Y2] @@ -378,8 +393,8 @@ paddsw mm3, mm4 ; b7b6b5b4 -> mm3 movq mm4, mm2 ; TEMP_Y1 -> mm4 paddsw mm2, mm0 ; b3b2b1b0 -> mm2 - psraw mm3, SCALEBITS - psraw mm2, SCALEBITS + psraw mm3, SCALEBITS_OUT + psraw mm2, SCALEBITS_OUT packuswb mm2, mm3 ; b7b6b5b4b3b2b1b0 -> mm2 movq [TEMP_B1], mm2 movq mm0, mm5 @@ -387,13 +402,13 @@ punpcklwd mm0, mm0 ; v1v1v0v0 -> mm0 paddsw mm1, mm5 ; r7r6r5r4 -> mm1 paddsw mm7, mm0 ; r3r2r1r0 -> mm7 - psraw mm1, SCALEBITS - psraw mm7, SCALEBITS + psraw mm1, SCALEBITS_OUT + psraw mm7, SCALEBITS_OUT packuswb mm7, mm1 ; r7r6r5r4r3r2r1r0 -> mm7 (TEMP_R2) paddsw mm6, mm5 ; r7r6r5r4 -> mm6 paddsw mm4, mm0 ; r3r2r1r0 -> mm4 - psraw mm6, SCALEBITS - psraw mm4, SCALEBITS + psraw mm6, SCALEBITS_OUT + psraw mm4, SCALEBITS_OUT packuswb mm4, mm6 ; r7r6r5r4r3r2r1r0 -> mm4 (TEMP_R1) movq mm0, [TEMP_B1] movq mm1, [TEMP_G1] @@ -500,7 +515,7 @@ ; Code ;============================================================================= -SECTION .rotext align=SECTION_ALIGN +TEXT %include "colorspace_mmx.inc"
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/src/image/x86_asm/colorspace_yuv_mmx.asm ^
@@ -19,7 +19,7 @@ ; * along with this program; if not, write to the Free Software ; * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ; * -; * $Id: colorspace_yuv_mmx.asm,v 1.10 2008/11/26 23:35:50 Isibaar Exp $ +; * $Id: colorspace_yuv_mmx.asm,v 1.10.2.2 2009/05/28 15:04:35 Isibaar Exp $ ; * ; ***************************************************************************/ @@ -133,7 +133,7 @@ pop DST %ifdef ARCH_IS_X86_64 - movsx _ECX, SRC_STRIDE + XVID_MOVSXD _ECX, SRC_STRIDE add SRC, _ECX mov ecx, DST_STRIDE add DST, _ECX @@ -468,7 +468,7 @@ ; Code ;============================================================================= -SECTION .rotext align=SECTION_ALIGN +TEXT MAKE_YV12_TO_YV12 yv12_to_yv12_mmx, 0
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/src/image/x86_asm/colorspace_yuyv_mmx.asm ^
@@ -19,7 +19,7 @@ ; * along with this program; if not, write to the Free Software ; * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ; * -; * $Id: colorspace_yuyv_mmx.asm,v 1.10 2008/11/26 01:04:34 Isibaar Exp $ +; * $Id: colorspace_yuyv_mmx.asm,v 1.10.2.1 2009/05/28 08:42:37 Isibaar Exp $ ; * ; ***************************************************************************/ @@ -319,7 +319,7 @@ ; Code ;============================================================================= -SECTION .rotext align=SECTION_ALIGN +TEXT %include "colorspace_mmx.inc"
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/src/image/x86_asm/deintl_sse.asm ^
@@ -20,7 +20,7 @@ ; * along with this program; if not, write to the Free Software ; * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ; * -; * $Id: deintl_sse.asm,v 1.4 2008/11/26 01:04:34 Isibaar Exp $ +; * $Id: deintl_sse.asm,v 1.4.2.1 2009/05/28 08:42:37 Isibaar Exp $ ; * ; *************************************************************************/ @@ -46,7 +46,7 @@ Mask_6b times 16 db 0x3f Rnd_3b: times 16 db 3 -SECTION .rotext align=SECTION_ALIGN +TEXT ;////////////////////////////////////////////////////////////////////// ;// sse version
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/src/image/x86_asm/gmc_mmx.asm ^
@@ -20,7 +20,7 @@ ; * along with this program; if not, write to the Free Software ; * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ; * -; * $Id: gmc_mmx.asm,v 1.7.2.2 2008/12/02 14:00:09 Isibaar Exp $ +; * $Id: gmc_mmx.asm,v 1.7.2.3 2009/05/28 08:42:37 Isibaar Exp $ ; * ; *************************************************************************/ @@ -48,7 +48,7 @@ Cst16: times 8 dw 16 -SECTION .rotext align=SECTION_ALIGN +TEXT ;////////////////////////////////////////////////////////////////////// ;// mmx version
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/src/image/x86_asm/interpolate8x8_3dn.asm ^
@@ -39,7 +39,7 @@ ; Code ;============================================================================= -SECTION .rotext align=SECTION_ALIGN +TEXT cglobal interpolate8x8_halfpel_h_3dn cglobal interpolate8x8_halfpel_v_3dn
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/src/image/x86_asm/interpolate8x8_3dne.asm ^
@@ -52,7 +52,7 @@ ; Macros ;============================================================================= -SECTION .rotext align=SECTION_ALIGN +TEXT cglobal interpolate8x8_halfpel_h_3dne cglobal interpolate8x8_halfpel_v_3dne @@ -210,7 +210,7 @@ push _ESI pcmpeqb mm1, mm1 pcmpeqb mm2, mm2 - mov _ESI, mm_minusone + lea _ESI, [mm_minusone] psubusb mm1, [byte _EAX] psubusb mm2, [_EAX+TMP1] lea _EAX, [_EAX+2TMP1] @@ -489,7 +489,7 @@ pcmpeqb mm1, mm1 pcmpeqb mm2, mm2 - mov _ESI, mm_minusone + lea _ESI, [mm_minusone] psubusb mm1, [byte _EAX] ; line1 psubusb mm2, [_EAX+TMP1] ; line2 lea _EAX, [_EAX+2TMP1] ; _EAX==line3
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/src/image/x86_asm/interpolate8x8_mmx.asm ^
@@ -77,7 +77,7 @@ ; Code ;============================================================================= -SECTION .rotext align=SECTION_ALIGN +TEXT cglobal interpolate8x8_halfpel_h_mmx cglobal interpolate8x8_halfpel_v_mmx
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/src/image/x86_asm/interpolate8x8_xmm.asm ^
@@ -34,7 +34,7 @@ mmx_one: times 8 db 1 -SECTION .rotext align=SECTION_ALIGN +TEXT cglobal interpolate8x8_halfpel_h_xmm cglobal interpolate8x8_halfpel_v_xmm
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/src/image/x86_asm/postprocessing_mmx.asm ^
@@ -19,7 +19,7 @@ ; * along with this program; if not, write to the Free Software ; * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ; * -; * $Id: postprocessing_mmx.asm,v 1.9 2008/11/26 23:35:50 Isibaar Exp $ +; * $Id: postprocessing_mmx.asm,v 1.9.2.2 2009/05/28 15:04:35 Isibaar Exp $ ; * ; ************************************************************************/ @@ -46,7 +46,7 @@ ; Code ;============================================================================= -SECTION .rotext align=SECTION_ALIGN +TEXT cglobal image_brightness_mmx @@ -61,7 +61,7 @@ movq mm6, [mmx_0x80] %ifdef ARCH_IS_X86_64 - movsx _EAX, prm5d + XVID_MOVSXD _EAX, prm5d lea TMP0, [mmx_offset] movq mm7, [TMP0 + (_EAX + 128)8] ; being lazy %else
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/src/image/x86_asm/postprocessing_sse2.asm ^
@@ -37,7 +37,7 @@ ; Code ;============================================================================= -SECTION .rotext align=SECTION_ALIGN +TEXT cglobal image_brightness_sse2 @@ -68,7 +68,7 @@ image_brightness_sse2: PUSH_XMM6_XMM7 %ifdef ARCH_IS_X86_64 - movsx _EAX, prm5d + XVID_MOVSXD _EAX, prm5d %else mov eax, prm5 ; brightness offset value %endif
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/src/image/x86_asm/qpel_mmx.asm ^
@@ -20,7 +20,7 @@ ; * along with this program; if not, write to the Free Software ; * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ; * -; * $Id: qpel_mmx.asm,v 1.9 2008/11/26 23:35:50 Isibaar Exp $ +; * $Id: qpel_mmx.asm,v 1.9.2.1 2009/05/28 08:42:37 Isibaar Exp $ ; * ; *************************************************************************/ @@ -239,7 +239,7 @@ FIR_C20: times 4 dw 20 FIR_C23: times 4 dw 23 -SECTION .rotext align=SECTION_ALIGN +TEXT ;////////////////////////////////////////////////////////////////////// ;// Here we go with the Q-Pel mess.
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/src/image/x86_asm/reduced_mmx.asm ^
@@ -19,7 +19,7 @@ ; * along with this program; if not, write to the Free Software ; * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ; * -; * $Id: reduced_mmx.asm,v 1.9 2008/11/26 01:04:34 Isibaar Exp $ +; * $Id: reduced_mmx.asm,v 1.9.2.1 2009/05/28 08:42:37 Isibaar Exp $ ; * ; *************************************************************************/ @@ -45,7 +45,7 @@ ;=========================================================================== -SECTION .rotext align=SECTION_ALIGN +TEXT cglobal xvid_Copy_Upsampled_8x8_16To8_mmx cglobal xvid_Add_Upsampled_8x8_16To8_mmx
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/src/motion/ia64_asm/calc_delta_1.s ^
@@ -1,3 +1,37 @@ +// **************************************************************************** +// * +// * XVID MPEG-4 VIDEO CODEC +// * - IA64 halfpel refinement - +// * +// * Copyright(C) 2002 Johannes Singler, Daniel Winkler +// * +// * This program is free software; you can redistribute it and/or modify it +// * under the terms of the GNU General Public License as published by +// * the Free Software Foundation; either version 2 of the License, or +// * (at your option) any later version. +// * +// * This program is distributed in the hope that it will be useful, +// * but WITHOUT ANY WARRANTY; without even the implied warranty of +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * GNU General Public License for more details. +// * +// * You should have received a copy of the GNU General Public License +// * along with this program; if not, write to the Free Software +// * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// * +// * $Id: calc_delta_1.s,v 1.1.14.1 2009/05/25 09:03:47 Isibaar Exp $ +// * +// *************************************************************************/ +// +// ************************************************************************** +// * +// * calc_delta_1.s, IA-64 halfpel refinement +// * +// * This version was implemented during an IA-64 practical training at +// * the University of Karlsruhe (http://i44w3.info.uni-karlsruhe.de/) +// * +// **************************************************************************** + ;; getf.sig ret0 = fmv add mpr[0] = mpr[0], mpr[1]
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/src/motion/ia64_asm/calc_delta_2.s ^
@@ -1,3 +1,37 @@ +// **************************************************************************** +// * +// * XVID MPEG-4 VIDEO CODEC +// * - IA64 halfpel refinement - +// * +// * Copyright(C) 2002 Johannes Singler, Daniel Winkler +// * +// * This program is free software; you can redistribute it and/or modify it +// * under the terms of the GNU General Public License as published by +// * the Free Software Foundation; either version 2 of the License, or +// * (at your option) any later version. +// * +// * This program is distributed in the hope that it will be useful, +// * but WITHOUT ANY WARRANTY; without even the implied warranty of +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * GNU General Public License for more details. +// * +// * You should have received a copy of the GNU General Public License +// * along with this program; if not, write to the Free Software +// * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// * +// * $Id: calc_delta_2.s,v 1.1.14.1 2009/05/25 09:03:47 Isibaar Exp $ +// * +// *************************************************************************/ +// +// ************************************************************************** +// * +// * calc_delta_2.s, IA-64 halfpel refinement +// * +// * This version was implemented during an IA-64 practical training at +// * the University of Karlsruhe (http://i44w3.info.uni-karlsruhe.de/) +// * +// **************************************************************************** + (non0_2) mov sc[0] = 1 (non0_3) mov sc[1] = 1 ;;
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/src/motion/ia64_asm/calc_delta_3.s ^
@@ -1,3 +1,37 @@ +// **************************************************************************** +// * +// * XVID MPEG-4 VIDEO CODEC +// * - IA64 halfpel refinement - +// * +// * Copyright(C) 2002 Johannes Singler, Daniel Winkler +// * +// * This program is free software; you can redistribute it and/or modify it +// * under the terms of the GNU General Public License as published by +// * the Free Software Foundation; either version 2 of the License, or +// * (at your option) any later version. +// * +// * This program is distributed in the hope that it will be useful, +// * but WITHOUT ANY WARRANTY; without even the implied warranty of +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * GNU General Public License for more details. +// * +// * You should have received a copy of the GNU General Public License +// * along with this program; if not, write to the Free Software +// * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// * +// * $Id: calc_delta_3.s,v 1.1.14.1 2009/05/25 09:03:47 Isibaar Exp $ +// * +// *************************************************************************/ +// +// ************************************************************************** +// * +// * calc_delta_3.s, IA-64 halfpel refinement +// * +// * This version was implemented during an IA-64 practical training at +// * the University of Karlsruhe (http://i44w3.info.uni-karlsruhe.de/) +// * +// **************************************************************************** + ;; (fb) mov iMinSAD = mpr[8] (fb) mov currX = backupX
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/src/motion/ia64_asm/halfpel8_refine_ia64.s ^
@@ -1,3 +1,37 @@ +// **************************************************************************** +// * +// * XVID MPEG-4 VIDEO CODEC +// * - IA64 halfpel refinement - +// * +// * Copyright(C) 2002 Johannes Singler, Daniel Winkler +// * +// * This program is free software; you can redistribute it and/or modify it +// * under the terms of the GNU General Public License as published by +// * the Free Software Foundation; either version 2 of the License, or +// * (at your option) any later version. +// * +// * This program is distributed in the hope that it will be useful, +// * but WITHOUT ANY WARRANTY; without even the implied warranty of +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * GNU General Public License for more details. +// * +// * You should have received a copy of the GNU General Public License +// * along with this program; if not, write to the Free Software +// * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// * +// * $Id: halfpel8_refine_ia64.s,v 1.3.14.1 2009/05/25 09:03:47 Isibaar Exp $ +// * +// *************************************************************************/ +// +// ************************************************************************** +// * +// * halfpel8_refine_ia64.s, IA-64 halfpel refinement +// * +// * This version was implemented during an IA-64 practical training at +// * the University of Karlsruhe (http://i44w3.info.uni-karlsruhe.de/) +// * +// **************************************************************************** + // ------------------------------------------------------------------------------ // * Programmed by // * Johannes Singler (email@jsingler.de), Daniel Winkler (infostudent@uni.de)
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/src/motion/ia64_asm/sad_ia64.s ^
@@ -1,3 +1,37 @@ +// **************************************************************************** +// * +// * XVID MPEG-4 VIDEO CODEC +// * - IA64 sum of absolute differences - +// * +// * Copyright(C) 2002 Hannes Jütting, Christopher Özbek +// * +// * This program is free software; you can redistribute it and/or modify it +// * under the terms of the GNU General Public License as published by +// * the Free Software Foundation; either version 2 of the License, or +// * (at your option) any later version. +// * +// * This program is distributed in the hope that it will be useful, +// * but WITHOUT ANY WARRANTY; without even the implied warranty of +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * GNU General Public License for more details. +// * +// * You should have received a copy of the GNU General Public License +// * along with this program; if not, write to the Free Software +// * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// * +// * $Id: sad_ia64.s,v 1.7.10.1 2009/05/25 09:03:47 Isibaar Exp $ +// * +// *************************************************************************/ +// +// ************************************************************************** +// * +// * sad_ia64.s, IA-64 sum of absolute differences +// * +// * This version was implemented during an IA-64 practical training at +// * the University of Karlsruhe (http://i44w3.info.uni-karlsruhe.de/) +// * +// **************************************************************************** + // ------------------------------------------------------------------------------ // * // * Optimized Assembler Versions of sad8 and sad16
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/src/motion/motion.h ^
@@ -1,32 +1,27 @@ -/************************************************************************ +/*************************************************************************** * * XVID MPEG-4 VIDEO CODEC - * - Motion header - + * - Motion module header - * - * This program is an implementation of a part of one or more MPEG-4 - * Video tools as specified in ISO/IEC 14496-2 standard. Those intending - * to use this software module in hardware or software products are - * advised that its use may infringe existing patents or copyrights, and - * any such use would be at such party's own risk. The original - * developer of this software module and his/her company, and subsequent - * editors and their companies, will have no liability for use of this - * software or modifications or derivatives thereof. + * Copyright(C) 2002-2003 Radoslaw Czyz <xvid@syskin.cjb.net> + * 2002 Michael Militzer <michael@xvid.org> + * * - * This program is free software; you can redistribute it and/or modify + * This program is free software ; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation ; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of + * but WITHOUT ANY WARRANTY ; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * along with this program ; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: motion.h,v 1.24 2005/12/18 06:52:12 syskin Exp $ + * $Id: motion.h,v 1.24.2.1 2009/05/25 09:03:47 Isibaar Exp $ * ***************************************************************************/
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/src/motion/x86_asm/sad_3dn.asm ^
@@ -19,7 +19,7 @@ ; * along with this program; if not, write to the Free Software ; * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ; * -; * $Id: sad_3dn.asm,v 1.12 2008/11/26 01:04:34 Isibaar Exp $ +; * $Id: sad_3dn.asm,v 1.12.2.1 2009/05/28 08:42:37 Isibaar Exp $ ; * ; ***************************************************************************/ @@ -114,7 +114,7 @@ ; Code ;============================================================================= -SECTION .rotext align=SECTION_ALIGN +TEXT cglobal sad16bi_3dn cglobal sad8bi_3dn
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/src/motion/x86_asm/sad_3dne.asm ^
@@ -19,7 +19,7 @@ ; * along with this program; if not, write to the Free Software ; * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ; * -; * $Id: sad_3dne.asm,v 1.10 2008/11/26 01:04:34 Isibaar Exp $ +; * $Id: sad_3dne.asm,v 1.10.2.1 2009/05/28 08:42:37 Isibaar Exp $ ; * ; ***************************************************************************/ @@ -201,7 +201,7 @@ ; Code ;============================================================================= -SECTION .rotext align=SECTION_ALIGN +TEXT cglobal sad16_3dne cglobal sad8_3dne
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/src/motion/x86_asm/sad_mmx.asm ^
@@ -20,7 +20,7 @@ ; * along with this program; if not, write to the Free Software ; * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ; * -; * $Id: sad_mmx.asm,v 1.20 2008/11/26 01:04:34 Isibaar Exp $ +; * $Id: sad_mmx.asm,v 1.20.2.1 2009/05/28 08:42:37 Isibaar Exp $ ; * ; ***************************************************************************/ @@ -242,7 +242,7 @@ ; Code ;============================================================================= -SECTION .rotext align=SECTION_ALIGN +TEXT cglobal sad16_mmx cglobal sad16v_mmx
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/src/motion/x86_asm/sad_sse2.asm ^
@@ -20,7 +20,7 @@ ; * along with this program; if not, write to the Free Software ; * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ; * -; * $Id: sad_sse2.asm,v 1.16.2.1 2008/12/01 17:27:03 Isibaar Exp $ +; * $Id: sad_sse2.asm,v 1.16.2.2 2009/05/28 08:42:37 Isibaar Exp $ ; * ; ***************************************************************************/ @@ -39,7 +39,7 @@ ; Code ;============================================================================= -SECTION .rotext align=SECTION_ALIGN +TEXT cglobal sad16_sse2 cglobal dev16_sse2
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/src/motion/x86_asm/sad_xmm.asm ^
@@ -21,7 +21,7 @@ ; * along with this program; if not, write to the Free Software ; * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ; * -; * $Id: sad_xmm.asm,v 1.13 2008/11/26 01:04:34 Isibaar Exp $ +; * $Id: sad_xmm.asm,v 1.13.2.1 2009/05/28 08:42:37 Isibaar Exp $ ; * ; ***************************************************************************/ @@ -118,7 +118,7 @@ ; Code ;============================================================================= -SECTION .rotext align=SECTION_ALIGN +TEXT cglobal sad16_xmm cglobal sad8_xmm
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/src/nasm.inc ^
@@ -19,7 +19,7 @@ ; * along with this program ; if not, write to the Free Software ; * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ; * -; * $Id: nasm.inc,v 1.1.2.2 2008/12/01 17:27:03 Isibaar Exp $ +; * $Id: nasm.inc,v 1.1.2.4 2009/05/28 15:04:35 Isibaar Exp $ ; * ; ***************************************************************************/ @@ -103,6 +103,11 @@ %define PTR_SIZE 8 %define PTR_TYPE qword +%ifdef __YASM_VERSION_ID__ +%define XVID_MOVSXD movsxd +%else +%define XVID_MOVSXD movsx +%endif %else @@ -149,6 +154,7 @@ %define PUSH_XMM6_XMM7 %define POP_XMM6_XMM7 +%define XVID_MOVSXD movsx %endif @@ -168,6 +174,14 @@ %endif %endmacro +%macro TEXT 0 +%ifidn __OUTPUT_FORMAT__,macho + SECTION .text align=SECTION_ALIGN +%else + SECTION .rotext align=SECTION_ALIGN +%endif +%endmacro + %macro cglobal 1 %ifdef PREFIX %ifdef MARK_FUNCS
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/src/plugins/x86_asm/plugin_ssim-a.asm ^
@@ -126,7 +126,7 @@ %endmacro -SECTION .rotext align=SECTION_ALIGN +TEXT cglobal lum_8x8_mmx cglobal consim_sse2
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/src/quant/ia64_asm/quant_h263_ia64.s ^
@@ -1,18 +1,53 @@ -//******************************************************************************* -//* * -//* functions quant_inter and dequant_inter have been softwarepipelined * -//* use was made of the pmpyshr2 instruction * -//* * -//* by Christian Engel and Hans-Joachim Daniels * -//* christian.engel@ira.uka.de hans-joachim.daniels@ira.uka.de * -//* * -//* This was made for the ia64 DivX laboratory (yes, it was really called * -//* this way, originally OpenDivX was intendet, but died shortly before our * -//* work started (you will probably already know ...)) * -//* at the Universitat Karlsruhe (TH) held between April and July 2002 * -//* http://www.info.uni-karlsruhe.de/~rubino/ia64p/ * -//* * -//*****************************************************************************/ +// ************************************************************************** +// * +// * XVID MPEG-4 VIDEO CODEC +// * - IA64 h.263 quantization - +// * +// * Copyright(C) 2002 Christian Engel, Hans-Joachim Daniels +// * +// * This program is free software; you can redistribute it and/or modify it +// * under the terms of the GNU General Public License as published by +// * the Free Software Foundation; either version 2 of the License, or +// * (at your option) any later version. +// * +// * This program is distributed in the hope that it will be useful, +// * but WITHOUT ANY WARRANTY; without even the implied warranty of +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * GNU General Public License for more details. +// * +// * You should have received a copy of the GNU General Public License +// * along with this program; if not, write to the Free Software +// * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// * +// * $Id: quant_h263_ia64.s,v 1.6.6.1 2009/05/25 09:03:47 Isibaar Exp $ +// * +// *************************************************************************/ +// +// ************************************************************************** +// * +// * quant_h263_ia64.s, IA-64 h.263 quantization +// * +// * This version was implemented during an IA-64 practical training at +// * the University of Karlsruhe (http://i44w3.info.uni-karlsruhe.de/) +// * +// ************************************************************************** + +// *************************************************************************** +// * +// * functions quant_inter and dequant_inter have been softwarepipelined +// * use was made of the pmpyshr2 instruction +// * +// * by Christian Engel and Hans-Joachim Daniels +// * christian.engel@ira.uka.de hans-joachim.daniels@ira.uka.de +// * +// * This was made for the ia64 DivX laboratory (yes, it was really called +// * this way, originally OpenDivX was intendet, but died shortly before our +// * work started (you will probably already know ...)) +// * at the Universitat Karlsruhe (TH) held between April and July 2002 +// * http://www.info.uni-karlsruhe.de/~rubino/ia64p/ +// * +// *****************************************************************************/ + .file "quant_h263_ia64.s" .pred.safe_across_calls p1-p5,p16-p63 .section .rodata
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/src/quant/x86_asm/quantize_h263_3dne.asm ^
@@ -19,7 +19,7 @@ ; * along with this program ; if not, write to the Free Software ; * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ; * -; * $Id: quantize_h263_3dne.asm,v 1.9 2008/11/26 01:04:34 Isibaar Exp $ +; * $Id: quantize_h263_3dne.asm,v 1.9.2.2 2009/05/28 15:04:35 Isibaar Exp $ ; * ; ************************************************************************/ ; @@ -135,7 +135,7 @@ ; Code ;============================================================================= -SECTION .rotext align=SECTION_ALIGN +TEXT ;----------------------------------------------------------------------------- @@ -344,7 +344,7 @@ %endif push _EBX - mov _EBX, mmzero + lea _EBX, [mmzero] push _EDI jz near .q1loop @@ -753,7 +753,7 @@ lea _EDI, [mmx_mul + _EAX8 - 8] ; 2quant %endif push _EBP - mov _EBX, mmx_2047 + lea _EBX, [mmx_2047] movsx _EBP, word [_ECX] %ifdef ARCH_IS_X86_64 lea r9, [mmx_add] @@ -762,7 +762,7 @@ lea _EAX, [mmx_add + _EAX8 - 8] ; quant or quant-1 %endif push _ESI - mov _ESI, mmzero + lea _ESI, [mmzero] pxor mm7, mm7 movq mm3, [_ECX+120] ;B2 ; c = coeff[i] pcmpeqw mm7, [_ECX+120] ;B6 (c ==0) ? -1 : 0 (1st) @@ -876,7 +876,7 @@ %else lea _EDI, [mmx_mul + _EAX8 - 8] ; 2quant %endif - mov _EBX, mmx_2047 + lea _EBX, [mmx_2047] pxor mm7, mm7 movq mm3, [_ECX+120] ;B2 ; c = coeff[i] pcmpeqw mm7, [_ECX+120] ;B6 (c ==0) ? -1 : 0 (1st) @@ -887,7 +887,7 @@ lea _EAX, [mmx_add + _EAX8 - 8] ; quant or quant-1 %endif psubw mm2, mm3 ;-c ;B3 (1st dep) - mov _ESI, mmzero + lea _ESI, [mmzero] pmaxsw mm2, mm3 ;\|c\| ;B4 (2nd) pmullw mm2, [_EDI] ;= 2Q ;B8 (3rd+) psraw mm3, 15 ; sign(c) ;B7 (2nd)
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/src/quant/x86_asm/quantize_h263_mmx.asm ^
@@ -21,7 +21,7 @@ ; * along with this program ; if not, write to the Free Software ; * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ; * -; * $Id: quantize_h263_mmx.asm,v 1.11.2.2 2008/12/02 14:00:09 Isibaar Exp $ +; * $Id: quantize_h263_mmx.asm,v 1.11.2.3 2009/05/28 08:42:37 Isibaar Exp $ ; * ; ****************************************************************************/ @@ -90,7 +90,7 @@ ; Code ;============================================================================= -SECTION .rotext align=SECTION_ALIGN +TEXT cglobal quant_h263_intra_mmx cglobal quant_h263_intra_sse2
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/src/quant/x86_asm/quantize_mpeg_mmx.asm ^
@@ -21,7 +21,7 @@ ; * along with this program ; if not, write to the Free Software ; * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ; * -; * $Id: quantize_mpeg_mmx.asm,v 1.13 2008/11/26 23:35:50 Isibaar Exp $ +; * $Id: quantize_mpeg_mmx.asm,v 1.13.2.1 2009/05/28 08:42:37 Isibaar Exp $ ; * ; *************************************************************************/ @@ -111,7 +111,7 @@ ; Code ;============================================================================= -SECTION .rotext align=SECTION_ALIGN +TEXT cglobal quant_mpeg_intra_mmx cglobal quant_mpeg_inter_mmx
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/src/quant/x86_asm/quantize_mpeg_xmm.asm ^
@@ -20,7 +20,7 @@ ; * along with this program ; if not, write to the Free Software ; * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ; * -; * $Id: quantize_mpeg_xmm.asm,v 1.10 2008/11/26 02:21:02 Isibaar Exp $ +; * $Id: quantize_mpeg_xmm.asm,v 1.10.2.2 2009/05/28 15:04:35 Isibaar Exp $ ; * ; ***************************************************************************/ @@ -137,7 +137,7 @@ ; Code ;============================================================================= -SECTION .rotext align=SECTION_ALIGN +TEXT cglobal quant_mpeg_inter_xmm cglobal dequant_mpeg_intra_3dne @@ -524,7 +524,7 @@ pxor mm6, mm6 ; mismatch sum push _ESI push _EDI - mov _ESI, mmzero + lea _ESI, [mmzero] pxor mm1, mm1 pxor mm3, mm3 %ifdef ARCH_IS_X86_64
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/src/utils/ia64_asm/mem_transfer_ia64.s ^
@@ -1,43 +1,49 @@ +// **************************************************************************** +// * +// * XVID MPEG-4 VIDEO CODEC +// * - IA64 8bit<->16bit transfer - +// * +// * Copyright(C) 2002 Sebastian Felis, Max Stengel +// * +// * This program is free software; you can redistribute it and/or modify it +// * under the terms of the GNU General Public License as published by +// * the Free Software Foundation; either version 2 of the License, or +// * (at your option) any later version. +// * +// * This program is distributed in the hope that it will be useful, +// * but WITHOUT ANY WARRANTY; without even the implied warranty of +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * GNU General Public License for more details. +// * +// * You should have received a copy of the GNU General Public License +// * along with this program; if not, write to the Free Software +// * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// * +// * $Id: mem_transfer_ia64.s,v 1.5.10.1 2009/05/25 09:03:47 Isibaar Exp $ +// * +// *************************************************************************/ +// +// ************************************************************************** +// * +// * mem_transfer_ia64.s, IA-64 8bit<->16bit transfer +// * +// * This version was implemented during an IA-64 practical training at +// * the University of Karlsruhe (http://i44w3.info.uni-karlsruhe.de/) +// * +// **************************************************************************** + /////////////////////////////////////////////////////////////////////////////// // // mem_transfer.c optimized for ia-64 by Sebastian Felis and Max Stengel, // University of Karlsruhe, Germany, 03.06.2002, during the laboratory // "IA-64 Video Codec Assember Parktikum" at IPD Goos. -// -// -///// legal header taken from original C-file /////////////////////////////////////// -// -// XVID MPEG-4 VIDEO CODEC -// - 8bit<->16bit transfer - -// -// This program is an implementation of a part of one or more MPEG-4 -// Video tools as specified in ISO/IEC 14496-2 standard. Those intending -// to use this software module in hardware or software products are -// advised that its use may infringe existing patents or copyrights, and -// any such use would be at such party's own risk. The original -// developer of this software module and his/her company, and subsequent -// editors and their companies, will have no liability for use of this -// software or modifications or derivatives thereof. -// -// This program is free software ; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation ; either version 2 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY ; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program ; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// + ///// History ///////////////////////////////////////////////////////////////// // // - 16.07.2002: several minor changes for ecc-conformity // - 03.06.2002: initial version // + /////////////////////////////////////////////////////////////////////////////// // // Annotations:
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/src/utils/x86_asm/cpuid.asm ^
@@ -19,7 +19,7 @@ ; * along with this program ; if not, write to the Free Software ; * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ; * -; * $Id: cpuid.asm,v 1.15.2.1 2008/12/02 14:00:09 Isibaar Exp $ +; * $Id: cpuid.asm,v 1.15.2.2 2009/05/28 08:42:37 Isibaar Exp $ ; * ; ***************************************************************************/ @@ -87,7 +87,7 @@ %define XVID_POPFD popfd %endif -SECTION .rotext align=SECTION_ALIGN +TEXT ; int check_cpu_feature(void)
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/src/utils/x86_asm/interlacing_mmx.asm ^
@@ -19,7 +19,7 @@ ; * along with this program ; if not, write to the Free Software ; * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ; * -; * $Id: interlacing_mmx.asm,v 1.10 2008/11/27 18:35:36 Isibaar Exp $ +; * $Id: interlacing_mmx.asm,v 1.10.2.1 2009/05/28 08:42:37 Isibaar Exp $ ; * ; ***************************************************************************/ @@ -45,7 +45,7 @@ ; Code ;============================================================================= -SECTION .rotext align=SECTION_ALIGN +TEXT cglobal MBFieldTest_mmx
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/src/utils/x86_asm/mem_transfer_3dne.asm ^
@@ -19,7 +19,7 @@ ; * along with this program ; if not, write to the Free Software ; * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ; * -; * $Id: mem_transfer_3dne.asm,v 1.11 2008/11/26 01:04:34 Isibaar Exp $ +; * $Id: mem_transfer_3dne.asm,v 1.11.2.1 2009/05/28 08:42:37 Isibaar Exp $ ; * ; ***************************************************************************/ @@ -53,7 +53,7 @@ ; Code ;============================================================================= -SECTION .rotext align=SECTION_ALIGN +TEXT cglobal transfer_8to16copy_3dne cglobal transfer_16to8copy_3dne
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/src/utils/x86_asm/mem_transfer_mmx.asm ^
@@ -21,7 +21,7 @@ ; * along with this program ; if not, write to the Free Software ; * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ; * -; * $Id: mem_transfer_mmx.asm,v 1.20 2008/11/26 01:04:34 Isibaar Exp $ +; * $Id: mem_transfer_mmx.asm,v 1.20.2.1 2009/05/28 08:42:37 Isibaar Exp $ ; * ; ***************************************************************************/ @@ -41,7 +41,7 @@ ; Code ;============================================================================= -SECTION .rotext align=SECTION_ALIGN +TEXT cglobal transfer_8to16copy_mmx cglobal transfer_16to8copy_mmx
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/src/xvid.c ^
@@ -19,7 +19,7 @@ * along with this program ; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: xvid.c,v 1.77.2.4 2008/12/01 16:35:47 Isibaar Exp $ + * $Id: xvid.c,v 1.77.2.5 2009/05/25 08:09:23 Isibaar Exp $ * ****************************************************************************/ @@ -665,7 +665,7 @@ return XVID_ERR_VERSION; info->actual_version = XVID_VERSION; - info->build = "xvid-1.2.1"; + info->build = "xvid-1.2.2"; info->cpu_flags = detect_cpu_flags(); info->num_threads = 0;
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/src/xvid.h ^
@@ -19,7 +19,7 @@ * along with this program ; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: xvid.h,v 1.63.2.2 2008/12/01 16:35:47 Isibaar Exp $ + * $Id: xvid.h,v 1.63.2.3 2009/05/25 08:09:23 Isibaar Exp $ * ***************************************************************************/ @@ -57,7 +57,7 @@ #define XVID_API_MAJOR(a) (((a)>>16) & 0xff) #define XVID_API_MINOR(a) (((a)>> 0) & 0xff) -#define XVID_VERSION XVID_MAKE_VERSION(1,2,1) +#define XVID_VERSION XVID_MAKE_VERSION(1,2,2) #define XVID_API XVID_MAKE_API(4, 2) / Bitstream Version
[-] [+]	Changed	xvidcore-1.2.2.tar.bz2/vfw/bin/Makefile ^
@@ -9,7 +9,7 @@ # Requires GNU Make because of shell expansion performed at a bad time with # other make programs (even using := variable assignments) # -# $Id: Makefile,v 1.6 2008/11/27 11:57:28 Isibaar Exp $ +# $Id: Makefile,v 1.6.2.1 2009/05/25 08:31:16 Isibaar Exp $ ############################################################################## include sources.inc @@ -25,6 +25,7 @@ # The `mingw-runtime` package is required when building with -mno-cygwin CFLAGS += -I$(SRC_DIR)/w32api -I$(LOCAL_XVID_SRCTREE) CFLAGS += -mno-cygwin +CFLAGS += -D_WIN32_IE=0x0501 ############################################################################## # Optional Compiler options