Packman Build Service PMBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 6

xvidcore.changes Changed

xvidcore.spec Changed

xvidcore-1.3.2.tar.bz2/build/generic/missing Deleted

@@ -1,376 +0,0 @@
-#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
-
-scriptversion=2009-04-28.21; # UTC
-
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009 Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
-
-# 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, 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, see <http://www.gnu.org/licenses/>.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
-  exit 1
-fi
-
-run=:
-sed_output='s/.* --output[ =]$[^ ]*$.*/\1/p'
-sed_minuso='s/.* -o $[^ ]*$.*/\1/p'
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
-  configure_ac=configure.ac
-else
-  configure_ac=configure.in
-fi
-
-msg="missing on your system"
-
-case $1 in
---run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  # Exit code 63 means version mismatch.  This often happens
-  # when the user try to use an ancient version of a tool on
-  # a file that requires a minimum version.  In this case we
-  # we should proceed has if the program had been absent, or
-  # if --run hadn't been passed.
-  if test $? = 63; then
-    run=:
-    msg="probably too old"
-  fi
-  ;;
-
-  -h|--h|--he|--hel|--help)
-    echo "\
-$0 [OPTION]... PROGRAM [ARGUMENT]...
-
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
-
-Options:
-  -h, --help      display this help and exit
-  -v, --version   output version information and exit
-  --run           try to run the given command, and emulate it if it fails
-
-Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  autom4te     touch the output file, or create a stub one
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-  flex         create \`lex.yy.c', if possible, from existing .c
-  help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
-
-Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
-\`g' are ignored when checking the name.
-
-Send bug reports to <bug-automake@gnu.org>."
-    exit $?
-    ;;
-
-  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing $scriptversion (GNU Automake)"
-    exit $?
-    ;;
-
-  -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
-    exit 1
-    ;;
-
-esac
-
-# normalize program name to check for.
-program=`echo "$1" | sed '
-  s/^gnu-//; t
-  s/^gnu//; t
-  s/^g//; t'`
-
-# Now exit if we have it, but it failed.  Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program).  This is about non-GNU programs, so use $1 not
-# $program.
-case $1 in
-  lex*|yacc*)
-    # Not GNU programs, they don't have --version.
-    ;;
-
-  tar*)
-    if test -n "$run"; then
-       echo 1>&2 "ERROR: \`tar' requires --run"
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       exit 1
-    fi
-    ;;
-
-  *)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       # Could not run --version or --help.  This is probably someone
-       # running `$TOOL --version' or `$TOOL --help' to check whether
-       # $TOOL exists and not knowing $TOOL uses missing.
-       exit 1
-    fi
-    ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case $program in
-  aclocal*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER($[^)]*$).*/\1/p' ${configure_ac}`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case $f in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
-
-  autom4te*)
-    echo 1>&2 "\

xvidcore-1.3.2.tar.bz2/ChangeLog -> xvidcore-1.3.3.tar.bz2/ChangeLog Changed

@@ -1,5 +1,164 @@
 # Note that this ChangeLog covers only changes to the release branch
 
+2014-03-05 08:37  Isibaar
+
+	* xvidcore/examples/xvid_encraw.c: Help info about zones usage and
+	  various fixes for compiler warnings - Patch by Elio Blanca
+
+2014-02-11 14:48  Isibaar
+
+	* xvidcore/examples/xvid_encraw.c: Improved help texts and defaults
+	  handling. Patch by Elio Blanca.
+
+2014-02-09 16:51  Isibaar
+
+	* xvidcore/examples/Makefile, xvidcore/examples/xvid_encraw.c:
+	  Better environment detection for Makefile - Patch by Elio Blanca
+
+2014-02-07 16:00  Isibaar
+
+	* xvidcore/examples/xvid_encraw.c: Fix out of bound access to
+	  framestats struct. Thanks to Elio Blanca.
+
+2013-02-18 16:24  Isibaar
+
+	* xvidcore/build/generic/configure.in: bring version number in
+	  configure.in in sync with rest of code
+
+2013-01-29 19:12  Isibaar
+
+	* xvidcore/build/generic/configure.in: Patch for QNX support by
+	  Mike Gorchak
+
+2012-10-04 14:26  Isibaar
+
+	* xvidcore/build/generic/configure.in: remove obsolete
+	  '-mno-cygwin' option for gcc version >= 4
+
+2012-06-21 09:55  Isibaar
+
+	* xvidcore/examples/xvid_encraw.c: Fixed bug in PGM header parser -
+	  thanks to Jim Bennett!
+
+2012-02-22 19:00  Isibaar
+
+	* xvidcore/dshow/src/CXvidDecoder.cpp,
+	  xvidcore/dshow/src/CXvidDecoder.h, xvidcore/dshow/src/config.c,
+	  xvidcore/dshow/src/config.h, xvidcore/dshow/src/resource.h,
+	  xvidcore/dshow/src/xvid.ax.rc: Ported tray icon patch from HEAD
+	  branch
+
+2011-12-30 13:04  Isibaar
+
+	* xvidcore/src/global.h: #define MIN/MAX macros only when not yet
+	  otherwise defined...
+
+2011-11-09 14:12  Isibaar
+
+	* xvidcore/src/plugins/plugin_lumimasking.c: Reverted change to
+	  max_quant calculation. Users prefer the former behavior...
+
+2011-11-04 15:23  Isibaar
+
+	* xvidcore/src/utils/mbtransquant.c, xvidcore/src/xvid.c,
+	  xvidcore/src/xvid.h: Fix for possible overflow in trellis
+	  quant...
+
+2011-10-25 10:57  Isibaar
+
+	* xvidcore/src/xvid.c, xvidcore/src/xvid.h: Ramp up version
+	  number...
+
+2011-10-25 10:53  Isibaar
+
+	* xvidcore/src/motion/estimation_bvop.c: Fix for encoder crash that
+	  is possible with the following combination of encoder options:
+	  Turbo, VHQ for B-VOPs and Qpel...
+
+2011-10-06 18:05  Isibaar
+
+	* xvidcore/src/plugins/plugin_lumimasking.c: Make sure max_quant is
+	  at least frame_quant+2 for lumi/variance masking
+
+2011-09-19 09:32  Isibaar
+
+	* xvidcore/build/generic/Makefile,
+	  xvidcore/build/generic/configure.in,
+	  xvidcore/build/generic/platform.inc.in: Install symlinks for
+	  shared library. Patch by Andres Mejia.
+
+2011-09-19 08:18  Isibaar
+
+	* xvidcore/build/generic/configure.in: Remove rhapsody OS case.
+	  Patch by Ryan Schmidt.
+
+2011-09-16 12:34  Isibaar
+
+	* xvidcore/build/generic/configure.in: Double check for pthread on
+	  MinGW. Patch by Motofumi Oka.
+
+2011-09-15 10:36  Isibaar
+
+	* xvidcore/build/generic/Makefile,
+	  xvidcore/build/generic/platform.inc.in: install xvidcore.dll to
+	  under Cygwin. Patch by Motofumi Oka.
+
+2011-09-15 09:34  Isibaar
+
+	* xvidcore/build/generic/configure.in: Try to autodetect name
+	  mangling variations for WIN64 cross-compiling. Patch by Motofumi
+	  Oka.
+
+2011-09-14 15:08  Isibaar
+
+	* xvidcore/build/generic/configure.in: removed obsolete -mno-cygwin
+
+2011-09-14 10:45  Isibaar
+
+	* xvidcore/build/generic/configure.in: platform-independent gcc
+	  versio check - patch by Motofumi Oka
+
+2011-08-19 16:20  Isibaar
+
+	* xvidcore/build/generic/configure.in,
+	  xvidcore/build/generic/platform.inc.in: User-supplied LDFLAGS.
+	  Patch by Ryan Schmidt and the MacPorts project.
+
+2011-07-28 07:48  Isibaar
+
+	* xvidcore/build/generic/configure.in: Added support for GNU Hurd
+	  as target_os
+
+2011-05-23 07:47  Isibaar
+
+	* xvidcore/src/xvid.c: removed deprecated call to idct_int32_init()
+
+2011-05-21 16:55  Isibaar
+
+	* xvidcore/ChangeLog: Updated ChangeLog
+
+2011-05-19 12:48  Isibaar
+
+	* xvidcore/dshow/src/CAbout.cpp,
+	  xvidcore/dshow/src/CXvidDecoder.cpp,
+	  xvidcore/dshow/src/Configure.cpp: autoprops property set also for
+	  .cpp files
+
+2011-05-19 12:24  Isibaar
+
+	* xvidcore/dshow/src/CXvidDecoder.cpp: Added #ifdef ENABLE_MFT
+	  check
+
+2011-05-19 12:23  Isibaar
+
+	* xvidcore/dshow/dshow.vcproj: Added special configurations for
+	  MFT-enabled builds
+
+2011-05-19 08:27  Isibaar
+
+	* xvidcore/build/generic/Makefile: Don't include platform.inc on
+	  make clean - Patch by Fabian Greffrath
+
 2011-05-18 16:13  Isibaar
 
 	* xvidcore/dshow/src/CXvidDecoder.cpp, xvidcore/dshow/src/config.c,

xvidcore-1.3.2.tar.bz2/README -> xvidcore-1.3.3.tar.bz2/README Changed

xvidcore-1.3.2.tar.bz2/build/generic/Makefile -> xvidcore-1.3.3.tar.bz2/build/generic/Makefile Changed

@@ -141,16 +141,29 @@
 #-----------------------------------------------------------------------------
 
 install: $(BUILD_DIR)/$(STATIC_LIB) $(BUILD_DIR)/$(SHARED_LIB)
-	@echo "  D: $(libdir)"
-	@$(INSTALL) -d $(DESTDIR)$(libdir)
-	@echo "  I: $(libdir)/$(SHARED_LIB)"
-	@$(INSTALL) -m 644 $(BUILD_DIR)/$(SHARED_LIB) $(DESTDIR)$(libdir)/$(SHARED_LIB)
-	@echo "  I: $(libdir)/$(STATIC_LIB)"
-	@$(INSTALL) -m 644 $(BUILD_DIR)/$(STATIC_LIB) $(DESTDIR)$(libdir)/$(STATIC_LIB)
 	@echo "  D: $(includedir)"
 	@$(INSTALL) -d $(DESTDIR)$(includedir)
 	@echo "  I: $(includedir)/xvid.h"
 	@$(INSTALL) -m 644 $(SRC_DIR)/xvid.h $(DESTDIR)$(includedir)/xvid.h
+	@echo "  D: $(libdir)"
+	@$(INSTALL) -d $(DESTDIR)$(libdir)
+	@echo "  I: $(libdir)/$(STATIC_LIB)"
+	@$(INSTALL) -m 644 $(BUILD_DIR)/$(STATIC_LIB) $(DESTDIR)$(libdir)/$(STATIC_LIB)
+ifeq ($(SHARED_EXTENSION),dll)
+	@echo "  I: $(libdir)/$(SHARED_LIB).a"
+	@$(INSTALL) -m 644 $(BUILD_DIR)/$(SHARED_LIB).a $(DESTDIR)$(libdir)/$(SHARED_LIB).a
+	@echo "  D: $(bindir)"
+	@$(INSTALL) -d $(DESTDIR)$(bindir)
+	@echo "  I: $(bindir)/$(SHARED_LIB)"
+	@$(INSTALL) -m 755 $(BUILD_DIR)/$(SHARED_LIB) $(DESTDIR)$(bindir)/$(SHARED_LIB)
+else
+	@echo "  I: $(libdir)/$(SHARED_LIB)"
+	@$(INSTALL) -m 644 $(BUILD_DIR)/$(SHARED_LIB) $(DESTDIR)$(libdir)/$(SHARED_LIB)
+	@test -z "$(SO_API_MAJOR_LINK)" || \
+		$(LN_S) $(SHARED_LIB) $(DESTDIR)$(libdir)/$(SO_API_MAJOR_LINK)
+	@test -z "$(SO_LINK)" || \
+		$(LN_S) $(SHARED_LIB) $(DESTDIR)$(libdir)/$(SO_LINK)
+endif
 
 #-----------------------------------------------------------------------------
 # Platorm specific file -- dumb rules for people executing make before

xvidcore-1.3.2.tar.bz2/build/generic/config.guess -> xvidcore-1.3.3.tar.bz2/build/generic/config.guess Changed

@@ -1,14 +1,12 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-#   Free Software Foundation, Inc.
+#   Copyright 1992-2013 Free Software Foundation, Inc.
 
-timestamp='2010-08-21'
+timestamp='2013-06-10'
 
 # This file 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 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
@@ -17,26 +15,22 @@
 # 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., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner.  Please send patches (context
-# diff format) to <config-patches@gnu.org> and include a ChangeLog
-# entry.
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
 #
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
+# Originally written by Per Bothner.
 #
 # You can get the latest version of this script from:
 # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+#
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -56,9 +50,7 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
-Software Foundation, Inc.
+Copyright 1992-2013 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -92,7 +84,7 @@
   exit 1
 fi
 
-trap 'exit 1' HUP INT TERM
+trap 'exit 1' 1 2 15
 
 # CC_FOR_BUILD -- compiler used by this script. Note that the use of a
 # compiler to aid in system detection is discouraged as it requires
@@ -106,7 +98,7 @@
 
 set_cc_for_build='
 trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" HUP INT PIPE TERM ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
 : ${TMPDIR=/tmp} ;
  { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
@@ -140,12 +132,43 @@
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
+case "${UNAME_SYSTEM}" in
+Linux|GNU|GNU/*)
+	# If the system lacks a compiler, then just pick glibc.
+	# We could probably try harder.
+	LIBC=gnu
+
+	eval $set_cc_for_build
+	cat <<-EOF > $dummy.c
+	#include <features.h>
+	#if defined(__UCLIBC__)
+	LIBC=uclibc
+	#elif defined(__dietlibc__)
+	LIBC=dietlibc
+	#else
+	LIBC=gnu
+	#endif
+	EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	;;
+esac
+
+case "${UNAME_MACHINE}" in
+  i?86)
+     test -z "$VENDOR" && VENDOR=pc
+     ;;
+  *)
+     test -z "$VENDOR" && VENDOR=unknown
+     ;;
+esac
+test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse
+
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:NetBSD:*:*)
 	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
 	# switched to ELF, *-*-netbsd* would select the old
 	# object file format.  This provides both forward
@@ -181,7 +204,7 @@
 		fi
 		;;
 	    *)
-	        os=netbsd
+		os=netbsd
 		;;
 	esac
 	# The OS release
@@ -202,21 +225,25 @@
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
 	exit ;;
+    *:Bitrig:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+	echo ${UNAME_MACHINE_ARCH}-${VENDOR}-bitrig${UNAME_RELEASE}
+	exit ;;
     *:OpenBSD:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+	echo ${UNAME_MACHINE_ARCH}-${VENDOR}-openbsd${UNAME_RELEASE}
 	exit ;;
     *:ekkoBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+	echo ${UNAME_MACHINE}-${VENDOR}-ekkobsd${UNAME_RELEASE}
 	exit ;;
     *:SolidBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+	echo ${UNAME_MACHINE}-${VENDOR}-solidbsd${UNAME_RELEASE}
 	exit ;;
     macppc:MirBSD:*:*)
-	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+	echo powerpc-${VENDOR}-mirbsd${UNAME_RELEASE}
 	exit ;;
     *:MirBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+	echo ${UNAME_MACHINE}-${VENDOR}-mirbsd${UNAME_RELEASE}
 	exit ;;
     alpha:OSF1:*:*)
 	case $UNAME_RELEASE in
@@ -224,7 +251,7 @@
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
 		;;
 	*5.*)
-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
 		;;
 	esac
 	# According to Compaq, /usr/sbin/psrinfo has been available on
@@ -270,7 +297,10 @@
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit ;;
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+	exitcode=$?
+	trap '' 0
+	exit $exitcode ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
@@ -281,13 +311,13 @@
 	echo alpha-dec-winnt3.5
 	exit ;;
     Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
+	echo m68k-${VENDOR}-sysv4
 	exit ;;
     *:[Aa]miga[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-amigaos
+	echo ${UNAME_MACHINE}-${VENDOR}-amigaos
 	exit ;;
     *:[Mm]orph[Oo][Ss]:*:*)

xvidcore-1.3.2.tar.bz2/build/generic/config.sub -> xvidcore-1.3.3.tar.bz2/build/generic/config.sub Changed

xvidcore-1.3.2.tar.bz2/build/generic/configure -> xvidcore-1.3.3.tar.bz2/build/generic/configure Changed

@@ -1,13 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for Xvid 1.3.2.
+# Generated by GNU Autoconf 2.69 for Xvid 1.3.3.
 #
 # Report bugs to <xvid-devel@xvid.org>.
 #
 #
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -136,6 +134,31 @@
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
@@ -169,7 +192,8 @@
 else
   exitcode=1; echo positional parameters were not saved.
 fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -214,21 +238,25 @@
 
 
       if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	# Preserve -v and -x to the replacement shell.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	case $- in # ((((
-	  *v*x* | *x*v* ) as_opts=-vx ;;
-	  *v* ) as_opts=-v ;;
-	  *x* ) as_opts=-x ;;
-	  * ) as_opts= ;;
-	esac
-	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
 fi
 
     if test x$as_have_required = xno; then :
@@ -331,6 +359,14 @@
 
 
 } # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -452,6 +488,10 @@
   chmod +x "$as_me.lineno" ||
     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
   # original and so on.  Autoconf is especially sensitive to this).
@@ -486,16 +526,16 @@
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -507,28 +547,8 @@
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -560,8 +580,8 @@
 # Identity of this package.
 PACKAGE_NAME='Xvid'
 PACKAGE_TARNAME='xvid'
-PACKAGE_VERSION='1.3.2'
-PACKAGE_STRING='Xvid 1.3.2'
+PACKAGE_VERSION='1.3.3'
+PACKAGE_STRING='Xvid 1.3.3'
 PACKAGE_BUGREPORT='xvid-devel@xvid.org'
 PACKAGE_URL=''
 
@@ -607,6 +627,8 @@
 LIBOBJS
 ALTIVEC_CFLAGS
 SHARED_LIB
+SO_LINK
+SO_API_MAJOR_LINK
 PRE_SHARED_LIB
 STATIC_LIB
 API_MINOR
@@ -630,9 +652,10 @@
 FEATURES
 ac_nasm

xvidcore-1.3.2.tar.bz2/build/generic/configure.in -> xvidcore-1.3.3.tar.bz2/build/generic/configure.in Changed

@@ -8,7 +8,7 @@
 
 AC_PREREQ([2.50])
 
-AC_INIT([Xvid], [1.3.2], [xvid-devel@xvid.org])
+AC_INIT([Xvid], [1.3.3], [xvid-devel@xvid.org])
 AC_CONFIG_SRCDIR(configure.in)
 
 dnl Do not forget to increase that when needed.
@@ -144,6 +144,18 @@
 AC_CHECK_TOOL([AR], [ar], [ar-not-found])
 
 dnl ==========================================================================
+dnl Check for the egrep program
+dnl ==========================================================================
+
+AC_PROG_EGREP
+
+dnl ==========================================================================
+dnl Check how the system supports symlinks.
+dnl ==========================================================================
+
+AC_PROG_LN_S
+
+dnl ==========================================================================
 dnl
 dnl This part looks for:
 dnl
@@ -237,7 +249,7 @@
 STATIC_EXTENSION=""
 OBJECT_EXTENSION=""
 case "$target_os" in
-     *bsd*|linux*|beos|irix*|solaris*)
+     *bsd*|linux*|beos|irix*|solaris*|gnu*|*qnx*)
 	AC_MSG_RESULT([.so .a .o])
 	STATIC_EXTENSION="a"
 	SHARED_EXTENSION="so"
@@ -249,7 +261,7 @@
 	SHARED_EXTENSION="dll"
 	OBJECT_EXTENSION="obj"
 	;;
-     darwin*|raphsody*)
+     darwin*)
 	if test x"$macosx_module" = x"yes"; then
 	   AC_MSG_RESULT([.so .a .o])
 	   SHARED_EXTENSION="so"
@@ -280,11 +292,15 @@
 SPECIFIC_CFLAGS=""
 ALTIVEC_CFLAGS=""
 PRE_SHARED_LIB=""
+SO_API_MAJOR_LINK=""
+SO_LINK=""
 case "$target_os" in
-     linux*|solaris*)
+     linux*|solaris*|gnu*|*qnx*)
 	AC_MSG_RESULT([ok])
 	STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
 	SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR).\$(API_MINOR)"
+	SO_API_MAJOR_LINK="libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR)"
+	SO_LINK="libxvidcore.\$(SHARED_EXTENSION)"
 	SPECIFIC_LDFLAGS="-Wl,-soname,libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR) -shared -Wl,--version-script=libxvidcore.ld -lc -lm"
 	SPECIFIC_CFLAGS="-fPIC"
 	;;
@@ -292,6 +308,8 @@
 	AC_MSG_RESULT([ok])
 	STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
 	SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR).\$(API_MINOR)"
+	SO_API_MAJOR_LINK="libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR)"
+	SO_LINK="libxvidcore.\$(SHARED_EXTENSION)"
 	SPECIFIC_LDFLAGS="-Wl,-soname,libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR) -shared -lc -lm"
 	SPECIFIC_CFLAGS="-fPIC"
 	;;
@@ -299,10 +317,10 @@
 	AC_MSG_RESULT([ok])
 	STATIC_LIB="xvidcore.\$(STATIC_EXTENSION)"
 	SHARED_LIB="xvidcore.\$(SHARED_EXTENSION)"
-	SPECIFIC_LDFLAGS="-mno-cygwin -shared -Wl,--dll,--out-implib,\$@.a libxvidcore.def"
+	SPECIFIC_LDFLAGS="-shared -Wl,--dll,--out-implib,\$@.a libxvidcore.def"
 	SPECIFIC_CFLAGS="-mno-cygwin"
 	;;
-     darwin*|raphsody*)
+     darwin*)
 	STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
 	SPECIFIC_CFLAGS="-fPIC -fno-common -no-cpp-precomp"
 	if test x"$macosx_module" = x"no"; then
@@ -419,7 +437,7 @@
    if test "$found_nasm_comp_prog" = "yes" ; then
        AC_MSG_CHECKING([for asm object format])
        case "$target_os" in
-           *bsd*|linux*|beos|irix*|solaris*)
+           *bsd*|linux*|beos|irix*|solaris*|gnu*|*qnx*)
                if test "$ARCHITECTURE" = "X86_64" ; then
                    AC_MSG_RESULT([elf64])
                    NASM_FORMAT="elf64"
@@ -438,8 +456,16 @@
                    AC_MSG_RESULT([win32])
                    NASM_FORMAT="win32"
                fi
-	       PREFIX="-DWINDOWS"
-	       MARK_FUNCS=""
+               PREFIX="-DWINDOWS"
+               if test "$GCC" = "yes" ; then
+                   echo 'int main(void) {return 0;}' > conftest.c
+                   $CC -S -o conftest conftest.c
+                   if test `$EGREP -c '_main:' conftest` -eq 0 ; then
+                       PREFIX="$PREFIX -DNO_PREFIX"
+                   fi
+                   rm -f conftest*
+               fi
+               MARK_FUNCS=""
                ;;
            *darwin*)
                if test "$ARCHITECTURE" = "X86_64" ; then
@@ -606,15 +632,40 @@
 dnl ==========================================================================
 
 if test x"$pthread" = x"yes" ; then
-   AC_CHECK_HEADER(
-	[pthread.h],
-	[AC_CHECK_LIB(
-		[pthread],
-		[pthread_create],
-		[SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -DHAVE_PTHREAD"
-		 SPECIFIC_LDFLAGS="$SPECIFIC_LDFLAGS -lpthread"],
-		AC_MSG_WARN(Pthread not supported. No SMP support))],
-	AC_MSG_WARN(Pthread not supported. No SMP support))
+	case "$target_os" in
+	    mingw32*)
+	        AC_CHECK_HEADER(
+		    [pthread.h],
+		    [AC_CHECK_LIB(
+			[pthreadGC2],
+			[pthread_create],
+			[SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -DHAVE_PTHREAD"
+			 SPECIFIC_LDFLAGS="$SPECIFIC_LDFLAGS -lpthreadGC2"],
+			[AC_CHECK_LIB(
+			    [pthread],
+			    [pthread_create],
+			    [SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -DHAVE_PTHREAD"
+			     SPECIFIC_LDFLAGS="$SPECIFIC_LDFLAGS -lpthread"],
+			    AC_MSG_WARN(Pthread not supported. No SMP support))])],
+		    AC_MSG_WARN(Pthread not supported. No SMP support))
+		;;
+	    *)
+		AC_CHECK_HEADER(
+		    [pthread.h],
+		    [AC_CHECK_LIB(
+			[pthread],
+			[pthread_create],
+			[SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -DHAVE_PTHREAD"
+			 SPECIFIC_LDFLAGS="$SPECIFIC_LDFLAGS -lpthread"],
+		            [AC_CHECK_LIB(
+		            [c],
+		            [pthread_create],
+		            [SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -DHAVE_PTHREAD"
+		             SPECIFIC_LDFLAGS="$SPECIFIC_LDFLAGS"],
+				AC_MSG_WARN(Pthread not supported. No SMP support))])],
+		    AC_MSG_WARN(Pthread not supported. No SMP support))
+		;;
+	esac
 else
    AC_MSG_WARN(Pthread support disabled. No SMP support)
 fi
@@ -649,26 +700,9 @@
 dnl ==========================================================================
 
 if test "$GCC" = "yes" ; then
-cat << EOF > test.c
-#include <stdio.h>
-int main(int argc, char **argv)
-{
-	if (*argv[[1]] == 'M') {
-		printf("%d", __GNUC__);
-	}
-	if (*argv[[1]] == 'm') {
-		printf("%d", __GNUC_MINOR__);
-	}
-	return 0;
-}
-EOF
-	$CC -o gcc-ver test.c
-	
-	GCC_MAJOR=`./gcc-ver M`
-	GCC_MINOR=`./gcc-ver m`
 
-	rm -f test.c
-	rm -f gcc-ver
+	GCC_MAJOR=`$CC -dumpversion | cut -d . -f 1`
+	GCC_MINOR=`$CC -dumpversion | cut -d . -f 2`
 
 	# GCC 4.x
 	if test "${GCC_MAJOR}" -gt 3 ; then
@@ -677,6 +711,7 @@
 		CFLAGS=`echo $CFLAGS | sed s,'-fmove-all-movables','',g`
 		CFLAGS=`echo $CFLAGS | sed s,'-fnew-ra','',g`
 		CFLAGS=`echo $CFLAGS | sed s,'-fwritable-strings','',g`
+                SPECIFIC_CFLAGS=`echo $SPECIFIC_CFLAGS | sed s,'-mno-cygwin','',g`
 	fi
 
 	# GCC 3.4.x

xvidcore-1.3.2.tar.bz2/build/generic/install-sh -> xvidcore-1.3.3.tar.bz2/build/generic/install-sh Changed

@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2010-02-06.18; # UTC
+scriptversion=2011-11-20.07; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -35,7 +35,7 @@
 # FSF changes to this file are in the public domain.
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
+# 'make' implicit rules from creating a file called install from it
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
@@ -156,6 +156,10 @@
     -s) stripcmd=$stripprog;;
 
     -t) dst_arg=$2
+	# Protect names problematic for 'test' and other utilities.
+	case $dst_arg in
+	  -* | [=!]) dst_arg=./$dst_arg;;
+	esac
 	shift;;
 
     -T) no_target_directory=true;;
@@ -186,6 +190,10 @@
     fi
     shift # arg
     dst_arg=$arg
+    # Protect names problematic for 'test' and other utilities.
+    case $dst_arg in
+      -* | [=!]) dst_arg=./$dst_arg;;
+    esac
   done
 fi
 
@@ -194,7 +202,7 @@
     echo "$0: no input file specified." >&2
     exit 1
   fi
-  # It's OK to call `install-sh -d' without argument.
+  # It's OK to call 'install-sh -d' without argument.
   # This can happen when creating conditional directories.
   exit 0
 fi
@@ -232,9 +240,9 @@
 
 for src
 do
-  # Protect names starting with `-'.
+  # Protect names problematic for 'test' and other utilities.
   case $src in
-    -*) src=./$src;;
+    -* | [=!]) src=./$src;;
   esac
 
   if test -n "$dir_arg"; then
@@ -256,12 +264,7 @@
       echo "$0: no destination specified." >&2
       exit 1
     fi
-
     dst=$dst_arg
-    # Protect names starting with `-'.
-    case $dst in
-      -*) dst=./$dst;;
-    esac
 
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
@@ -351,7 +354,7 @@
 	      if test -z "$dir_arg" || {
 		   # Check for POSIX incompatibilities with -m.
 		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-		   # other-writeable bit of parent directory when it shouldn't.
+		   # other-writable bit of parent directory when it shouldn't.
 		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
 		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
 		   case $ls_ld_tmpdir in
@@ -389,7 +392,7 @@
 
       case $dstdir in
 	/*) prefix='/';;
-	-*) prefix='./';;
+	[-=!]*) prefix='./';;
 	*)  prefix='';;
       esac
 
@@ -407,7 +410,7 @@
 
       for d
       do
-	test -z "$d" && continue
+	test X"$d" = X && continue
 
 	prefix=$prefix$d
 	if test -d "$prefix"; then

xvidcore-1.3.2.tar.bz2/build/generic/platform.inc.in -> xvidcore-1.3.3.tar.bz2/build/generic/platform.inc.in Changed

xvidcore-1.3.2.tar.bz2/dshow/src/CXvidDecoder.cpp -> xvidcore-1.3.3.tar.bz2/dshow/src/CXvidDecoder.cpp Changed

@@ -1,2323 +1,2329 @@
-/*****************************************************************************
- *
- *  XVID MPEG-4 VIDEO CODEC
- *  - Xvid Decoder part of the DShow Filter  -
- *
- *  Copyright(C) 2002-2011 Peter Ross <pross@xvid.org>
- *               2003-2011 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
- *
- * $Id: CXvidDecoder.cpp 2006 2011-05-19 12:48:59Z Isibaar $
- *
- ****************************************************************************/
-
- /* 
-	this requires the directx sdk
-	place these paths at the top of the Tools|Options|Directories list
-
-	headers:
-	C:\DX90SDK\Include
-	C:\DX90SDK\Samples\C++\DirectShow\BaseClasses
-	
-	C:\DX90SDK\Samples\C++\DirectShow\BaseClasses\Release
-	C:\DX90SDK\Samples\C++\DirectShow\BaseClasses\Debug
-*/
-
-#ifdef ENABLE_MFT
-#define XVID_USE_MFT
-#endif
-
-#define XVID_USE_TRAYICON
-
-#include <windows.h>
-
-#include <streams.h>
-#include <initguid.h>
-#include <olectl.h>
-#if (1100 > _MSC_VER)
-#include <olectlid.h>
-#endif
-#include <dvdmedia.h>	// VIDEOINFOHEADER2
-
-#if defined(XVID_USE_MFT)
-#define MFT_UNIQUE_METHOD_NAMES
-#include <mftransform.h>
-#include <mfapi.h>
-#include <mferror.h>
-#include <shlwapi.h>
-#endif
-
-#include <shellapi.h>
-
-#include <xvid.h>		// Xvid API
-
-#include "resource.h"
-
-#include "IXvidDecoder.h"
-#include "CXvidDecoder.h"
-#include "CAbout.h"
-#include "config.h"
-#include "debug.h"
-
-static bool USE_IYUV;
-static bool USE_YV12;
-static bool USE_YUY2;
-static bool USE_YVYU;
-static bool USE_UYVY;
-static bool USE_RGB32;
-static bool USE_RGB24;
-static bool USE_RG555;
-static bool USE_RG565;
-
-const AMOVIESETUP_MEDIATYPE sudInputPinTypes[] =
-{
-    { &MEDIATYPE_Video, &CLSID_XVID },
-	{ &MEDIATYPE_Video, &CLSID_XVID_UC },
-	{ &MEDIATYPE_Video, &CLSID_DIVX },
-	{ &MEDIATYPE_Video, &CLSID_DIVX_UC },
-	{ &MEDIATYPE_Video, &CLSID_DX50 },
-	{ &MEDIATYPE_Video, &CLSID_DX50_UC },
-	{ &MEDIATYPE_Video, &CLSID_3IVX },
-	{ &MEDIATYPE_Video, &CLSID_3IVX_UC },
-	{ &MEDIATYPE_Video, &CLSID_3IV0 },
-	{ &MEDIATYPE_Video, &CLSID_3IV0_UC },
-	{ &MEDIATYPE_Video, &CLSID_3IV1 },
-	{ &MEDIATYPE_Video, &CLSID_3IV1_UC },
-	{ &MEDIATYPE_Video, &CLSID_3IV2 },
-	{ &MEDIATYPE_Video, &CLSID_3IV2_UC },
-	{ &MEDIATYPE_Video, &CLSID_LMP4 },
-	{ &MEDIATYPE_Video, &CLSID_LMP4_UC },
-	{ &MEDIATYPE_Video, &CLSID_RMP4 },
-	{ &MEDIATYPE_Video, &CLSID_RMP4_UC },
-	{ &MEDIATYPE_Video, &CLSID_SMP4 },
-	{ &MEDIATYPE_Video, &CLSID_SMP4_UC },
-	{ &MEDIATYPE_Video, &CLSID_HDX4 },
-	{ &MEDIATYPE_Video, &CLSID_HDX4_UC },
-	{ &MEDIATYPE_Video, &CLSID_MP4V },
-  { &MEDIATYPE_Video, &CLSID_MP4V_UC },
-};
-
-const AMOVIESETUP_MEDIATYPE sudOutputPinTypes[] =
-{
-    { &MEDIATYPE_Video, &MEDIASUBTYPE_NULL }
-};
-
-
-const AMOVIESETUP_PIN psudPins[] =
-{
-	{
-		L"Input",           // String pin name
-		FALSE,              // Is it rendered
-		FALSE,              // Is it an output
-		FALSE,              // Allowed none
-		FALSE,              // Allowed many
-		&CLSID_NULL,        // Connects to filter
-		L"Output",          // Connects to pin
-		sizeof(sudInputPinTypes) / sizeof(AMOVIESETUP_MEDIATYPE), // Number of types
-		&sudInputPinTypes[0]	// The pin details
-	},
-	{ 
-		L"Output",          // String pin name
-		FALSE,              // Is it rendered
-		TRUE,               // Is it an output
-		FALSE,              // Allowed none
-		FALSE,              // Allowed many
-		&CLSID_NULL,        // Connects to filter
-		L"Input",           // Connects to pin
-		sizeof(sudOutputPinTypes) / sizeof(AMOVIESETUP_MEDIATYPE),	// Number of types
-		sudOutputPinTypes	// The pin details
-	}
-};
-
-
-const AMOVIESETUP_FILTER sudXvidDecoder =
-{
-	&CLSID_XVID,			// Filter CLSID
-	XVID_NAME_L,			// Filter name
-	MERIT_PREFERRED+2,		// Its merit
-	sizeof(psudPins) / sizeof(AMOVIESETUP_PIN),	// Number of pins
-	psudPins				// Pin details
-};
-
-
-// List of class IDs and creator functions for the class factory. This
-// provides the link between the OLE entry point in the DLL and an object
-// being created. The class factory will call the static CreateInstance
-
-CFactoryTemplate g_Templates[] =
-{
-	{ 
-		XVID_NAME_L,
-		&CLSID_XVID,
-		CXvidDecoder::CreateInstance,
-		NULL,
-		&sudXvidDecoder
-	},
-	{
-		XVID_NAME_L L"About",
-		&CLSID_CABOUT,
-		CAbout::CreateInstance
-	}
-
-};
-
-/* note: g_cTemplates must be global; used by strmbase.lib(dllentry.cpp,dllsetup.cpp) */
-int g_cTemplates = sizeof(g_Templates) / sizeof(CFactoryTemplate);
-
-#ifdef XVID_USE_TRAYICON
-extern HINSTANCE g_xvid_hInst;
-
-static int GUI_Page = 0;
-static int Tray_Icon = 0;
-extern "C" void CALLBACK Configure(HWND hWndParent, HINSTANCE hInstParent, LPSTR lpCmdLine, int nCmdShow );
-
-LRESULT CALLBACK msg_proc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-	switch ( uMsg )
-	{
-	case WM_ICONMESSAGE:
-		switch(lParam)
-		{
-		case WM_LBUTTONDBLCLK:
-			if (!GUI_Page) {
-				GUI_Page = 1;
-				Configure(hwnd, g_xvid_hInst, "", 1);
-				GUI_Page = 0;
-			}

xvidcore-1.3.2.tar.bz2/dshow/src/CXvidDecoder.h -> xvidcore-1.3.3.tar.bz2/dshow/src/CXvidDecoder.h Changed

xvidcore-1.3.2.tar.bz2/dshow/src/config.c -> xvidcore-1.3.3.tar.bz2/dshow/src/config.c Changed

@@ -1,283 +1,296 @@
-/*****************************************************************************
- *
- *  XVID MPEG-4 VIDEO CODEC
- *  - Configuration processing -
- *
- *  Copyright(C) 2002-2011 Peter Ross <pross@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
- *
- * $Id: config.c 1995 2011-05-18 16:13:23Z Isibaar $
- *
- ****************************************************************************/
-
-#include <windows.h>
-#include <commctrl.h>
-#include <xvid.h>
-#include "config.h"
-#include "debug.h"
-#include "resource.h"
-
-
-// -----------------------------------------
-// global config structure
-CONFIG g_config;
-
-
-
-void LoadRegistryInfo()
-{
-	HKEY hKey;
-	DWORD size;
-	RegOpenKeyEx(XVID_REG_KEY, XVID_REG_SUBKEY, 0, KEY_READ, &hKey);
-
-	// Set the default post-processing settings
-	REG_GET_N("Brightness", g_config.nBrightness, 0)
-	REG_GET_N("Deblock_Y",  g_config.nDeblock_Y, 0)
-	REG_GET_N("Deblock_UV", g_config.nDeblock_UV, 0)
-	REG_GET_N("Dering_Y",  g_config.nDering_Y, 0)
-	REG_GET_N("Dering_UV",  g_config.nDering_UV, 0)
-	REG_GET_N("FilmEffect", g_config.nFilmEffect, 0)
-	REG_GET_N("ForceColorspace", g_config.nForceColorspace, 0)
-	REG_GET_N("FlipVideo",  g_config.nFlipVideo, 0)
-	REG_GET_N("Supported_4CC",  g_config.supported_4cc, 0)
-	REG_GET_N("Videoinfo_Compat",  g_config.videoinfo_compat, 0)
-	REG_GET_N("Decoder_Aspect_Ratio",  g_config.aspect_ratio, 0)
-	REG_GET_N("num_threads",  g_config.num_threads, 0)
-	REG_GET_N("cpu_flags", g_config.cpu, 0)
-
-	RegCloseKey(hKey);
-}
-
-void SaveRegistryInfo()
-{
-	HKEY hKey;
-	DWORD dispo;
-
-	if (RegCreateKeyEx(
-			XVID_REG_KEY,
-			XVID_REG_SUBKEY,
-			0,
-			XVID_REG_CLASS,
-			REG_OPTION_NON_VOLATILE,
-			KEY_WRITE,
-			0, 
-			&hKey, 
-			&dispo) != ERROR_SUCCESS)
-	{
-		OutputDebugString("Couldn't create XVID_REG_SUBKEY");
-		return;
-	}
-
-	REG_SET_N("Brightness", g_config.nBrightness);
-	REG_SET_N("Deblock_Y",  g_config.nDeblock_Y);
-	REG_SET_N("Deblock_UV", g_config.nDeblock_UV);
-	REG_SET_N("Dering_Y", g_config.nDering_Y);
-	REG_SET_N("Dering_UV", g_config.nDering_UV);
-	REG_SET_N("FilmEffect", g_config.nFilmEffect);
-	REG_SET_N("ForceColorspace", g_config.nForceColorspace);
-	REG_SET_N("FlipVideo", g_config.nFlipVideo);
-	REG_SET_N("Supported_4CC",  g_config.supported_4cc);
-	REG_SET_N("Videoinfo_Compat",  g_config.videoinfo_compat);
-	REG_SET_N("Decoder_Aspect_Ratio", g_config.aspect_ratio);
-	REG_SET_N("num_threads",  g_config.num_threads);
-
-	RegCloseKey(hKey);
-}
-
-
-
-INT_PTR CALLBACK adv_proc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-	HWND hBrightness;
-
-	switch ( uMsg )
-	{
-	case WM_DESTROY:
-		{
-			LPARAM nForceColorspace;
-			LPARAM aspect_ratio;
-
-			nForceColorspace = SendMessage(GetDlgItem(hwnd, IDC_COLORSPACE), CB_GETCURSEL, 0, 0); 
-			if ( g_config.nForceColorspace != nForceColorspace )
-			{
-				MessageBox(0, "You have changed the output colorspace.\r\nClose the movie and open it for the new colorspace to take effect.", "Xvid DShow", MB_TOPMOST);
-			}
-			g_config.nForceColorspace = (int) nForceColorspace;
-
-			aspect_ratio = SendMessage(GetDlgItem(hwnd, IDC_USE_AR), CB_GETCURSEL, 0, 0);
-			if ( g_config.aspect_ratio != aspect_ratio )
-			{
-				MessageBox(0, "You have changed the default aspect ratio.\r\nClose the movie and open it for the new aspect ratio to take effect.", "Xvid DShow", MB_TOPMOST);
-			}
-			g_config.aspect_ratio = (int) aspect_ratio;
-			SaveRegistryInfo();
-		}
-		break;
-
-	case WM_INITDIALOG:
-		{
-			xvid_gbl_info_t info;
-			char core[100];
-			HINSTANCE m_hdll;
-
-			memset(&info, 0, sizeof(info));
-			info.version = XVID_VERSION;
-
-			m_hdll = LoadLibrary(XVID_DLL_NAME);
-			if (m_hdll != NULL) {
-
-				((int (__cdecl *)(void *, int, void *, void *))GetProcAddress(m_hdll, "xvid_global"))
-					(0, XVID_GBL_INFO, &info, NULL);
-
-				wsprintf(core, "Xvid MPEG-4 Video Codec v%d.%d.%d",
-					XVID_VERSION_MAJOR(info.actual_version),
-					XVID_VERSION_MINOR(info.actual_version),
-					XVID_VERSION_PATCH(info.actual_version));
-
-				FreeLibrary(m_hdll);
-			} else {
-				wsprintf(core, "xvidcore.dll not found!");
-			}
-
-			SetDlgItemText(hwnd, IDC_CORE, core);
-		}
-
-		// Load Force Colorspace Box
-		SendMessage(GetDlgItem(hwnd, IDC_COLORSPACE), CB_ADDSTRING, 0, (LPARAM)"No Force"); 
-		SendMessage(GetDlgItem(hwnd, IDC_COLORSPACE), CB_ADDSTRING, 0, (LPARAM)"YV12"); 
-		SendMessage(GetDlgItem(hwnd, IDC_COLORSPACE), CB_ADDSTRING, 0, (LPARAM)"YUY2"); 
-		SendMessage(GetDlgItem(hwnd, IDC_COLORSPACE), CB_ADDSTRING, 0, (LPARAM)"RGB24"); 
-		SendMessage(GetDlgItem(hwnd, IDC_COLORSPACE), CB_ADDSTRING, 0, (LPARAM)"RGB32"); 
-
-		// Select Colorspace
-		SendMessage(GetDlgItem(hwnd, IDC_COLORSPACE), CB_SETCURSEL, g_config.nForceColorspace, 0); 
-
-		hBrightness = GetDlgItem(hwnd, IDC_BRIGHTNESS);
-		SendMessage(hBrightness, TBM_SETRANGE, (WPARAM)TRUE, (LPARAM)MAKELONG(-96, 96));
-		SendMessage(hBrightness, TBM_SETTICFREQ, (WPARAM)16, (LPARAM)0);
-		SendMessage(hBrightness, TBM_SETPOS, (WPARAM)TRUE, (LPARAM) g_config.nBrightness);
-
-		// Load Aspect Ratio Box
-		SendMessage(GetDlgItem(hwnd, IDC_USE_AR), CB_ADDSTRING, 0, (LPARAM)"Auto (MPEG-4 first)"); 
-		SendMessage(GetDlgItem(hwnd, IDC_USE_AR), CB_ADDSTRING, 0, (LPARAM)"Auto (external first)"); 
-		SendMessage(GetDlgItem(hwnd, IDC_USE_AR), CB_ADDSTRING, 0, (LPARAM)"4:3"); 
-		SendMessage(GetDlgItem(hwnd, IDC_USE_AR), CB_ADDSTRING, 0, (LPARAM)"16:9"); 
-		SendMessage(GetDlgItem(hwnd, IDC_USE_AR), CB_ADDSTRING, 0, (LPARAM)"2.35:1"); 
-
-		// Select Aspect Ratio
-		SendMessage(GetDlgItem(hwnd, IDC_USE_AR), CB_SETCURSEL, g_config.aspect_ratio, 0);
-
-		
-		// Load Buttons
-		SendMessage(GetDlgItem(hwnd, IDC_DEBLOCK_Y), BM_SETCHECK, g_config.nDeblock_Y, 0);
-		SendMessage(GetDlgItem(hwnd, IDC_DEBLOCK_UV), BM_SETCHECK, g_config.nDeblock_UV, 0);
-		SendMessage(GetDlgItem(hwnd, IDC_DERINGY), BM_SETCHECK, g_config.nDering_Y, 0);
-		SendMessage(GetDlgItem(hwnd, IDC_DERINGUV), BM_SETCHECK, g_config.nDering_UV, 0);
-		SendMessage(GetDlgItem(hwnd, IDC_FILMEFFECT), BM_SETCHECK, g_config.nFilmEffect, 0);
-		SendMessage(GetDlgItem(hwnd, IDC_FLIPVIDEO), BM_SETCHECK, g_config.nFlipVideo, 0);
-
-		// 4CC checkbuttons
-		SendMessage(GetDlgItem(hwnd, IDC_DIVX), BM_SETCHECK, g_config.supported_4cc & SUPPORT_DIVX, 0);
-		SendMessage(GetDlgItem(hwnd, IDC_3IVX), BM_SETCHECK, g_config.supported_4cc & SUPPORT_3IVX, 0);
-		SendMessage(GetDlgItem(hwnd, IDC_MP4V), BM_SETCHECK, g_config.supported_4cc & SUPPORT_MP4V, 0);
-		SendMessage(GetDlgItem(hwnd, IDC_COMPAT), BM_SETCHECK, g_config.videoinfo_compat, 0);
-
-		EnableWindow(GetDlgItem(hwnd,IDC_DERINGY),g_config.nDeblock_Y);
-		EnableWindow(GetDlgItem(hwnd,IDC_DERINGUV),g_config.nDeblock_UV);

xvidcore-1.3.2.tar.bz2/dshow/src/config.h -> xvidcore-1.3.3.tar.bz2/dshow/src/config.h Changed

xvidcore-1.3.2.tar.bz2/dshow/src/resource.h -> xvidcore-1.3.3.tar.bz2/dshow/src/resource.h Changed

@@ -1,42 +1,43 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by xvid.ax.rc
-//
-#define VERSION_RES_MINOR_VER           0
-#define VERSION_RES_BUILD               0
-#define VER_DEBUG                       0
-#define IDS_ABOUT                       1
-#define VERSION_RES_MAJOR_VER           8
-#define IDD_ABOUT                       102
-#define IDB_LOGO                        103
-#define IDI_ICON                        104
-#define IDC_BRIGHTNESS                  1002
-#define IDC_DEBLOCK_UV                  1003
-#define IDC_DEBLOCK_Y                   1004
-#define IDC_FLIPVIDEO                   1005
-#define IDC_COLORSPACE                  1006
-#define IDC_RESET                       1007
-#define IDC_FILMEFFECT                  1008
-#define IDC_DERING                      1009
-#define IDC_DERINGY                     1009
-#define IDC_DIVX                        1010
-#define IDC_COMPAT                      1011
-#define IDC_MP4V                        1012
-#define IDC_3IVX                        1013
-#define IDC_DERINGUV                    1014
-#define IDC_USE_AR                      1015
-#define IDC_CORE                        1016
-#define VERSION_RES_LANGUAGE            0x409
-#define VERSION_RES_CHARSET             1252
-#define IDC_STATIC                      -1
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        106
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1017
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by xvid.ax.rc
+//
+#define VERSION_RES_MINOR_VER           0
+#define VERSION_RES_BUILD               0
+#define VER_DEBUG                       0
+#define IDS_ABOUT                       1
+#define VERSION_RES_MAJOR_VER           8
+#define IDD_ABOUT                       102
+#define IDB_LOGO                        103
+#define IDI_ICON                        104
+#define IDC_BRIGHTNESS                  1002
+#define IDC_DEBLOCK_UV                  1003
+#define IDC_DEBLOCK_Y                   1004
+#define IDC_FLIPVIDEO                   1005
+#define IDC_COLORSPACE                  1006
+#define IDC_RESET                       1007
+#define IDC_FILMEFFECT                  1008
+#define IDC_DERING                      1009
+#define IDC_DERINGY                     1009
+#define IDC_DIVX                        1010
+#define IDC_COMPAT                      1011
+#define IDC_MP4V                        1012
+#define IDC_3IVX                        1013
+#define IDC_DERINGUV                    1014
+#define IDC_USE_AR                      1015
+#define IDC_CORE                        1016
+#define IDC_TRAYICON                    1017
+#define VERSION_RES_LANGUAGE            0x409
+#define VERSION_RES_CHARSET             1252
+#define IDC_STATIC                      -1
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        106
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1018
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif

xvidcore-1.3.2.tar.bz2/dshow/src/xvid.ax.rc -> xvidcore-1.3.3.tar.bz2/dshow/src/xvid.ax.rc Changed

@@ -29,7 +29,7 @@
 // Dialog
 //
 
-IDD_ABOUT DIALOG DISCARDABLE  0, 0, 216, 267
+IDD_ABOUT DIALOG DISCARDABLE  0, 0, 216, 296
 STYLE WS_CHILD
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -62,7 +62,7 @@
     GROUPBOX        "Other MPEG-4 video support",IDC_STATIC,7,187,202,29
     CONTROL         "Other",IDC_MP4V,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
                     160,198,38,13
-    PUSHBUTTON      "Reset",IDC_RESET,79,252,50,12
+    PUSHBUTTON      "Reset",IDC_RESET,79,282,50,12
     LTEXT           "Output Colourspace",IDC_STATIC,136,151,67,9
     CONTROL         "Dering (UV)",IDC_DERINGUV,"Button",BS_AUTOCHECKBOX | 
                     WS_TABSTOP,98,123,53,10
@@ -71,6 +71,9 @@
                     233,109,8
     COMBOBOX        IDC_USE_AR,135,230,68,95,CBS_DROPDOWNLIST | WS_VSCROLL | 
                     WS_TABSTOP
+    CONTROL         "Display Tray-Icon when playing back Xvid video",IDC_TRAYICON,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,21,260,182,13
+    GROUPBOX        "GUI Options",IDC_STATIC,7,250,202,29
 END

xvidcore-1.3.2.tar.bz2/examples/Makefile -> xvidcore-1.3.3.tar.bz2/examples/Makefile Changed

xvidcore-1.3.2.tar.bz2/examples/xvid_encraw.c -> xvidcore-1.3.3.tar.bz2/examples/xvid_encraw.c Changed

@@ -6,7 +6,7 @@
  *  Copyright(C) 2002-2003 Christoph Lampert <gruel@web.de>
  *               2002-2003 Edouard Gomez <ed.gomez@free.fr>
  *               2003      Peter Ross <pross@xvid.org>
- *               2003-2010 Michael Militzer <isibaar@xvid.org>
+ *               2003-2014 Michael Militzer <isibaar@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
@@ -22,7 +22,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_encraw.c 1985 2011-05-18 09:02:35Z Isibaar $
+ * $Id: xvid_encraw.c 2083 2014-04-08 20:20:17Z Isibaar $
  *
  ****************************************************************************/
 
@@ -40,10 +40,10 @@
  ************************************************************************/
 
 #include <stdio.h>
-//#include <io.h>
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
+#include <ctype.h>
 #ifndef WIN32
 #include <sys/time.h>
 #else
@@ -126,7 +126,13 @@
 
 #define MAX_ZONES   64
 #define MAX_ENC_INSTANCES 4
+#define MAX_XDIM 4096
+#define MAX_YDIM 4096
 #define DEFAULT_QUANT 400
+#define DEFAULT_BITRATE 700000 /* bitrate expressed in bps, not kbps */
+#define DEFAULT_INTERLACING 1  /* 1:BFF, 2:TFF */
+#define DEFAULT_SSIM 2
+#define DEFAULT_PROGRESS 10    /* show progress every 10 frames by default */
 
 typedef struct
 {
@@ -187,9 +193,7 @@
 
 static 	int ARG_NUM_APP_THREADS = 1;
 static 	int ARG_CPU_FLAGS = 0;
-static 	int ARG_STATS = 0;
 static 	int ARG_SSIM = -1;
-static 	int ARG_PSNRHVSM = 0;
 static 	char* ARG_SSIM_PATH = NULL;
 static 	int ARG_DUMP = 0;
 static 	int ARG_LUMIMASKING = 0;
@@ -219,21 +223,12 @@
 static 	int ARG_BQRATIO = 150;
 static 	int ARG_BQOFFSET = 100;
 static	int ARG_MAXBFRAMES = 2;
-static 	int ARG_PACKED = 1;
 static 	int ARG_DEBUG = 0;
-static 	int ARG_VOPDEBUG = 0;
-static 	int ARG_TRELLIS = 1;
 static 	int ARG_QTYPE = 0;
 static 	int ARG_QMATRIX = 0;
-static 	int ARG_GMC = 0;
 static 	int ARG_INTERLACING = 0;
-static 	int ARG_QPEL = 0;
-static 	int ARG_TURBO = 0;
 static 	int ARG_VHQMODE = 1;
-static 	int ARG_BVHQ = 0;
 static 	int ARG_QMETRIC = 0;
-static 	int ARG_CLOSED_GOP = 1;
-static 	int ARG_CHROMAME = 1;
 static 	int ARG_PAR = 1;
 static 	int ARG_PARHEIGHT;
 static 	int ARG_PARWIDTH;
@@ -258,12 +253,25 @@
 static 	int ARG_VBVPEAKRATE = 0;
 static 	int ARG_THREADS = 0;
 static 	int ARG_SLICES = 1;
-static 	int ARG_VFR = 0;
 static 	int ARG_PROGRESS = 0;
 static 	int ARG_COLORSPACE = XVID_CSP_YV12;
 	/* the path where to save output */
 static char filepath[256] = "./";
 
+/* on/off options */
+static  int ARG_USE_ASSEMBLER = 1;
+static  int ARG_TURBO         = 0;
+static  int ARG_BVHQ          = 0;
+static  int ARG_QPEL          = 0;
+static  int ARG_GMC           = 0;
+static  int ARG_PACKED        = 1;
+static  int ARG_CLOSED_GOP    = 1;
+static  int ARG_STATS         = 0;
+static  int ARG_PSNRHVSM      = 0;
+static  int ARG_VOPDEBUG      = 0;
+static  int ARG_CHROMAME      = 1;
+static  int ARG_TRELLIS       = 1;
+
 static 	unsigned char qmatrix_intra[64];
 static 	unsigned char qmatrix_inter[64];
 
@@ -345,7 +353,7 @@
 
 	int input_num = 0;
 	int totalsize = 0;
-	int use_assembler = 1;
+	int use_assembler = ARG_USE_ASSEMBLER;
 	int i;
 
 	printf("xvid_encraw - raw mpeg4 bitstream encoder ");
@@ -396,7 +404,7 @@
 					ARG_BITRATE *= 1000;
 			}
 			else
-				ARG_BITRATE = 700000;
+				ARG_BITRATE = DEFAULT_BITRATE;
 		} else if (strcmp("-size", argv[i]) == 0 && i < argc - 1) {
 			i++;
 			ARG_TARGETSIZE = atoi(argv[i]);
@@ -445,6 +453,8 @@
 			ARG_PACKED = 2;
 		} else if (strcmp("-nochromame", argv[i]) == 0) {
 			ARG_CHROMAME = 0;
+		} else if (strcmp("-chromame", argv[i]) == 0) {
+			ARG_CHROMAME = 1;
 		} else if (strcmp("-threads", argv[i]) == 0 && i < argc -1) {
 			i++;
 			ARG_THREADS = atoi(argv[i]);
@@ -581,14 +591,18 @@
 			ARG_INPUTFILE = argv[i];
 		} else if (strcmp("-stats", argv[i]) == 0) {
 			ARG_STATS = 1;
+		} else if (strcmp("-nostats", argv[i]) == 0) {
+			ARG_STATS = 0;
 		} else if (strcmp("-ssim", argv[i]) == 0) {
-			ARG_SSIM = 2;
+			ARG_SSIM = DEFAULT_SSIM;
 			if ((i < argc - 1) && (*argv[i+1] != '-')) {
 				i++;
 				ARG_SSIM = atoi(argv[i]);
 			}
 		} else if (strcmp("-psnrhvsm", argv[i]) == 0) {
 			ARG_PSNRHVSM = 1;
+		} else if (strcmp("-nopsnrhvsm", argv[i]) == 0) {
+			ARG_PSNRHVSM = 0;
 		} else if (strcmp("-ssim_file", argv[i]) == 0 && i < argc -1) {
 			i++;
 			ARG_SSIM_PATH = argv[i];
@@ -679,22 +693,34 @@
 #endif
 		} else if (strcmp("-vop_debug", argv[i]) == 0) {
 			ARG_VOPDEBUG = 1;
+		} else if (strcmp("-novop_debug", argv[i]) == 0) {
+			ARG_VOPDEBUG = 0;
+		} else if (strcmp("-trellis", argv[i]) == 0) {
+			ARG_TRELLIS = 1;
 		} else if (strcmp("-notrellis", argv[i]) == 0) {
 			ARG_TRELLIS = 0;
 		} else if (strcmp("-bvhq", argv[i]) == 0) {
 			ARG_BVHQ = 1;
+		} else if (strcmp("-nobvhq", argv[i]) == 0) {
+			ARG_BVHQ = 0;
 		} else if (strcmp("-qpel", argv[i]) == 0) {
 			ARG_QPEL = 1;
+		} else if (strcmp("-noqpel", argv[i]) == 0) {
+			ARG_QPEL = 0;
 		} else if (strcmp("-turbo", argv[i]) == 0) {
 			ARG_TURBO = 1;
+		} else if (strcmp("-noturbo", argv[i]) == 0) {
+			ARG_TURBO = 0;
 		} else if (strcmp("-gmc", argv[i]) == 0) {
 			ARG_GMC = 1;
+		} else if (strcmp("-nogmc", argv[i]) == 0) {
+			ARG_GMC = 0;
 		} else if (strcmp("-interlaced", argv[i]) == 0) {
 			if ((i < argc - 1) && (*argv[i+1] != '-')) {
 				i++;
 				ARG_INTERLACING = atoi(argv[i]);
 			} else {
-				ARG_INTERLACING = 1;
+				ARG_INTERLACING = DEFAULT_INTERLACING;
 			}
 		} else if (strcmp("-noclosed_gop", argv[i]) == 0) {
 			ARG_CLOSED_GOP = 0;
@@ -752,9 +778,40 @@
 			if (ARG_PROGRESS > 0)
 				i++;
 			else
-				ARG_PROGRESS = 10;
+				ARG_PROGRESS = DEFAULT_PROGRESS;
 		} else if (strcmp("-help", argv[i]) == 0) {
-			usage();
+		    if (i < argc - 1 && strcmp("zones", argv[i+1]) == 0) {
+				fprintf(stderr, "Zones options\n\
+NB: You can define up to %d zones using the -zones option as described below.\n\
+\n\
+ -zones start,mode,value[,options][/start,mode,value[,options]]...\n\
+\n\

xvidcore-1.3.2.tar.bz2/src/global.h -> xvidcore-1.3.3.tar.bz2/src/global.h Changed

xvidcore-1.3.2.tar.bz2/src/motion/estimation_bvop.c -> xvidcore-1.3.3.tar.bz2/src/motion/estimation_bvop.c Changed

@@ -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: estimation_bvop.c 1985 2011-05-18 09:02:35Z Isibaar $
+ * $Id: estimation_bvop.c 2050 2011-10-25 10:53:24Z Isibaar $
  *
  ****************************************************************************/
 
@@ -809,6 +809,26 @@
 	if (Data->iMinSAD[0] < *best_sad) *best_sad = Data->iMinSAD[0];
 }
 
+static void
+SearchInterpolate_final_fast(const int x, const int y,
+							 const uint32_t MotionFlags,
+							 const MBParam * const pParam,
+							 int32_t * const best_sad,
+							 SearchData * const Data)
+{
+	/* qpel refinement */
+	if (Data->qpel) {
+		Data->qpel_precision = 1;
+		get_range(&Data->min_dx, &Data->max_dx, &Data->min_dy, &Data->max_dy, 
+			x, y, 4, pParam->width, pParam->height, Data->iFcode, 2);
+		
+		Data->currentQMV[0].x = 2 * Data->currentMV[0].x;
+		Data->currentQMV[0].y = 2 * Data->currentMV[0].y;
+		Data->currentQMV[1].x = 2 * Data->currentMV[1].x;
+		Data->currentQMV[1].y = 2 * Data->currentMV[1].y;
+	}
+}
+
 static void 
 ModeDecision_BVOP_SAD(const SearchData * const Data_d,
 					  const SearchData * const Data_b,
@@ -1083,9 +1103,13 @@
 								  &Data_i, Data_f.currentMV[0], Data_b.currentMV[0]);
 
 			if (((Data_i.iMinSAD[0] < best_sad +(best_sad>>3)) && !(frame->motion_flags&XVID_ME_FAST_MODEINTERPOLATE))
-				|| Data_i.iMinSAD[0] <= best_sad)
+				|| Data_i.iMinSAD[0] <= best_sad) {
 
 				SearchInterpolate_final(i, j, frame->motion_flags, pParam, &best_sad, &Data_i);
+			}
+			else {
+				SearchInterpolate_final_fast(i, j, frame->motion_flags, pParam, &best_sad, &Data_i);
+			}
 			
 			if (Data_d.iMinSAD[0] <= 2*best_sad)
 				if ((!(frame->motion_flags&XVID_ME_SKIP_DELTASEARCH) && (best_sad > 750))

xvidcore-1.3.2.tar.bz2/src/plugins/plugin_lumimasking.c -> xvidcore-1.3.3.tar.bz2/src/plugins/plugin_lumimasking.c Changed

xvidcore-1.3.2.tar.bz2/src/utils/mbtransquant.c -> xvidcore-1.3.3.tar.bz2/src/utils/mbtransquant.c Changed

xvidcore-1.3.2.tar.bz2/src/xvid.c -> xvidcore-1.3.3.tar.bz2/src/xvid.c Changed

@@ -3,8 +3,8 @@
  *  XVID MPEG-4 VIDEO CODEC
  *  - Native API implementation  -
  *
- *  Copyright(C) 2001-2011 Peter Ross <pross@xvid.org>
- *               2002-2011 Michael Militzer <isibaar@xvid.org>
+ *  Copyright(C) 2001-2014 Peter Ross <pross@xvid.org>
+ *               2002-2014 Michael Militzer <isibaar@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
@@ -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: xvid.c 2011 2011-05-23 07:47:37Z Isibaar $
+ * $Id: xvid.c 2082 2014-04-08 20:19:42Z Isibaar $
  *
  ****************************************************************************/
 
@@ -367,7 +367,7 @@
 
 		/* Quantization related functions */
 		quant_h263_intra   = quant_h263_intra_mmx;
-                quant_h263_inter   = quant_h263_inter_mmx;
+		quant_h263_inter   = quant_h263_inter_mmx;
 		dequant_h263_intra = dequant_h263_intra_mmx;
 		dequant_h263_inter = dequant_h263_inter_mmx;
 		quant_mpeg_intra   = quant_mpeg_intra_mmx;
@@ -699,7 +699,7 @@
 		return XVID_ERR_VERSION;
 
 	info->actual_version = XVID_VERSION;
-	info->build = "xvid-1.3.2";
+	info->build = "xvid-1.3.3";
 	info->cpu_flags = detect_cpu_flags();
 	info->num_threads = 0; /* single-thread */

xvidcore-1.3.2.tar.bz2/src/xvid.h -> xvidcore-1.3.3.tar.bz2/src/xvid.h Changed

@@ -3,7 +3,7 @@
  * XVID MPEG-4 VIDEO CODEC
  * - Xvid Main header file -
  *
- *  Copyright(C) 2001-2011 Peter Ross <pross@xvid.org>
+ *  Copyright(C) 2001-2014 Peter Ross <pross@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
@@ -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 1985 2011-05-18 09:02:35Z Isibaar $
+ * $Id: xvid.h 2082 2014-04-08 20:19:42Z Isibaar $
  *
  ****************************************************************************/
 
@@ -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,3,2)
+#define XVID_VERSION             XVID_MAKE_VERSION(1,3,3)
 #define XVID_API                 XVID_MAKE_API(4, 3)
 
 /* Bitstream Version
@@ -71,7 +71,7 @@
  * doesnt hurt but not increasing it could cause difficulty for decoders in the
  * future
  */
-#define XVID_BS_VERSION 64 
+#define XVID_BS_VERSION 65 
 
 /*****************************************************************************
  * error codes