Packman Build Service PMBS

xvidcore.changes Changed

xvidcore.spec Changed

xvidcore-1.3.0.tar.bz2/ChangeLog -> xvidcore-1.3.1.tar.bz2/ChangeLog Changed

@@ -1,6 +1,115 @@
 # Note that this ChangeLog covers only changes to the HEAD branch
 
 ---------------------
+Date: 2011/03/17 16:13:25
+Author: Isibaar
+Branch: release-1_3-branch
+Tag: (none) 
+Log:
+Don't flip RGB output for MFT decoder
+
+Members: 
+	dshow/src/CXvidDecoder.cpp:1.25->1.25.2.4 
+	dshow/src/CXvidDecoder.h:1.9->1.9.2.2 
+
+---------------------
+Date: 2011/03/10 16:27:57
+Author: Isibaar
+Branch: release-1_3-branch
+Tag: (none) 
+Log:
+increase version number to 1.3.1
+
+Members: 
+	build/generic/configure.in:1.33.2.3->1.33.2.4 
+	debian/changelog:1.3->1.3.2.2 
+
+---------------------
+Date: 2011/03/08 22:07:00
+Author: Isibaar
+Branch: release-1_3-branch
+Tag: (none) 
+Log:
+ramp up version number to 1.3.1
+
+Members: 
+	src/xvid.c:1.85.2.2->1.85.2.3 
+	src/xvid.h:1.74.2.3->1.74.2.4 
+
+---------------------
+Date: 2011/03/08 20:18:34
+Author: Isibaar
+Branch: release-1_3-branch
+Tag: (none) 
+Log:
+fixed padding regression for input widths/heights not multiple of 16
+
+Members: 
+	src/encoder.c:1.135.2.4->1.135.2.5 
+	src/xvid.h:1.74.2.2->1.74.2.3 
+	src/image/image.c:1.46.2.1->1.46.2.2 
+
+---------------------
+Date: 2011/02/25 14:15:35
+Author: Isibaar
+Branch: release-1_3-branch
+Tag: (none) 
+Log:
+fixed syntax error for pthread check - thanks to Fabrian Greffrath
+
+Members: 
+	build/generic/configure.in:1.33->1.33.2.3 
+
+---------------------
+Date: 2011/02/25 13:40:25
+Author: Isibaar
+Branch: release-1_3-branch
+Tag: (none) 
+Log:
+noexec stack check not only for "elf" but also "elf32" - thanks to Fabian Greffrath
+
+Members: 
+	src/nasm.inc:1.7->1.7.2.2 
+
+---------------------
+Date: 2011/02/16 20:04:39
+Author: Isibaar
+Branch: release-1_3-branch
+Tag: release-1_3_0 
+Log:
+decoder support for lower case FourCCs (from Jawor's patch)
+GUI cosmetics (from Jawor's patch)
+
+Members: 
+	vfw/src/codec.c:1.30.2.2->1.30.2.3 
+	vfw/src/codec.h:1.7->1.7.2.1 
+	vfw/src/config.c:1.45->1.45.2.2 
+	vfw/src/resource.rc:1.30.2.1->1.30.2.2 
+
+---------------------
+Date: 2011/02/14 18:26:20
+Author: Isibaar
+Branch: release-1_3-branch
+Tag: (none) 
+Log:
+updated changelog for 1_3 branch
+
+Members: 
+	ChangeLog:1.17->1.17.2.1 
+
+---------------------
+Date: 2011/02/14 18:21:00
+Author: Isibaar
+Branch: release-1_3-branch
+Tag: (none) 
+Log:
+Increased version number
+
+Members: 
+	src/xvid.c:1.85->1.85.2.2 
+	src/xvid.h:1.74->1.74.2.2 
+
+---------------------
 Date: 2011/02/14 17:58:54
 Author: Isibaar
 Branch: release-1_3-branch

xvidcore-1.3.0.tar.bz2/build/generic/configure -> xvidcore-1.3.1.tar.bz2/build/generic/configure Changed

@@ -1,83 +1,426 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for Xvid 1.3.0.
+# Generated by GNU Autoconf 2.68 for Xvid 1.3.1.
 #
 # Report bugs to <xvid-devel@xvid.org>.
 #
-# Copyright (C) 2003 Free Software Foundation, Inc.
+#
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+# Foundation, Inc.
+#
+#
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
 
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
 fi
-DUALCASE=1; export DUALCASE # for MKS sh
 
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\$.*\$"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\$.*\$$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\$.*\$"`;;
+      esac;
+      expr "X$arg" : "X\$.*\$" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
 fi
 
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
+case $0 in #((
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
+IFS=$as_save_IFS
 
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
 PS1='$ '
 PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+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
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+else
+  case \`(set -o) 2>/dev/null\` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+"
+  as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
+
+exitcode=0
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+
+else
+  exitcode=1; echo positional parameters were not saved.
+fi
+test x\$exitcode = x0 || 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'\" &&
+  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1"

xvidcore-1.3.0.tar.bz2/build/generic/configure.in -> xvidcore-1.3.1.tar.bz2/build/generic/configure.in Changed

xvidcore-1.3.0.tar.bz2/debian/changelog -> xvidcore-1.3.1.tar.bz2/debian/changelog Changed

xvidcore-1.3.0.tar.bz2/dshow/dshow.vcproj -> xvidcore-1.3.1.tar.bz2/dshow/dshow.vcproj Changed

@@ -77,14 +77,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="msvcrt.lib winmm.lib strmbase.lib comctl32.lib Shlwapi.lib mfplat.lib mfuuid.lib"
+				AdditionalDependencies="libcmt.lib winmm.lib strmbase.lib comctl32.lib Shlwapi.lib mfplat.lib mfuuid.lib"
 				OutputFile="bin\xvid.ax"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				IgnoreAllDefaultLibraries="true"
 				ModuleDefinitionFile=".\src\xvid.ax.def"
 				ProgramDatabaseFile=".\Release/xvid.pdb"
-				EntryPointSymbol="DllMain"
+				EntryPointSymbol="_DllMainCRTStartup@12"
 				ImportLibrary=".\Release/xvid.lib"
 				TargetMachine="1"
 			/>
@@ -174,7 +174,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="msvcrt.lib winmm.lib strmbasd.lib comctl32.lib Shlwapi.lib mfplat.lib mfuuid.lib"
+				AdditionalDependencies="libcmtd.lib winmm.lib strmbasd.lib comctl32.lib Shlwapi.lib mfplat.lib mfuuid.lib"
 				OutputFile="bin\xvid.ax"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
@@ -182,7 +182,7 @@
 				ModuleDefinitionFile=".\src\xvid.ax.def"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Debug/xvid.pdb"
-				EntryPointSymbol="DllMain"
+				EntryPointSymbol="_DllMainCRTStartup@12"
 				ImportLibrary=".\Debug/xvid.lib"
 				TargetMachine="1"
 			/>
@@ -274,14 +274,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="msvcrt.lib winmm.lib strmbase.lib comctl32.lib Shlwapi.lib mfplat.lib mfuuid.lib"
+				AdditionalDependencies="libcmt.lib winmm.lib strmbase.lib comctl32.lib Shlwapi.lib mfplat.lib mfuuid.lib"
 				OutputFile="bin\x64\xvid.ax"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
 				IgnoreAllDefaultLibraries="true"
 				ModuleDefinitionFile=".\src\xvid.ax.def"
 				ProgramDatabaseFile="$(IntDir)\xvid.pdb"
-				EntryPointSymbol="DllMain"
+				EntryPointSymbol="_DllMainCRTStartup"
 				ImportLibrary="$(IntDir)\xvid.lib"
 				TargetMachine="17"
 			/>
@@ -371,15 +371,15 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="msvcrt.lib winmm.lib strmbasd.lib comctl32.lib Shlwapi.lib mfplat.lib mfuuid.lib"
-				OutputFile="bin\xvid.ax"
+				AdditionalDependencies="libcmtd.lib winmm.lib strmbasd.lib comctl32.lib Shlwapi.lib mfplat.lib mfuuid.lib"
+				OutputFile="bin\x64\xvid.ax"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
 				IgnoreAllDefaultLibraries="true"
 				ModuleDefinitionFile=".\src\xvid.ax.def"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(IntDir)\xvid.pdb"
-				EntryPointSymbol="DllMain"
+				EntryPointSymbol="_DllMainCRTStartup"
 				ImportLibrary="$(IntDir)\xvid.lib"
 				TargetMachine="17"
 			/>

xvidcore-1.3.0.tar.bz2/dshow/src/CXvidDecoder.cpp -> xvidcore-1.3.1.tar.bz2/dshow/src/CXvidDecoder.cpp Changed

@@ -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: CXvidDecoder.cpp,v 1.25.2.3 2011/02/14 16:58:54 Isibaar Exp $
+ * $Id: CXvidDecoder.cpp,v 1.25.2.4 2011/03/17 15:13:25 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -816,7 +816,7 @@
 /* (internal function) change colorspace */
 #define CALC_BI_STRIDE(width,bitcount)  ((((width * bitcount) + 31) & ~31) >> 3)
 
-HRESULT CXvidDecoder::ChangeColorspace(GUID subtype, GUID formattype, void * format)
+HRESULT CXvidDecoder::ChangeColorspace(GUID subtype, GUID formattype, void * format, int noflip)
 {
 	DWORD biWidth;
 
@@ -839,6 +839,8 @@
 		return S_FALSE;
 	}
 
+	if (noflip) rgb_flip = 0;
+
 	if (subtype == CLSID_MEDIASUBTYPE_IYUV)
 	{
 		DPRINTF("IYUV");
@@ -912,7 +914,7 @@
 	
 	if (direction == PINDIR_OUTPUT)
 	{
-		return ChangeColorspace(*pmt->Subtype(), *pmt->FormatType(), pmt->Format());
+		return ChangeColorspace(*pmt->Subtype(), *pmt->FormatType(), pmt->Format(), 0);
 	}
 	
 	return S_OK;
@@ -1049,7 +1051,7 @@
 	{
 		HRESULT result;
 
-		result = ChangeColorspace(mtOut->subtype, mtOut->formattype, mtOut->pbFormat);
+		result = ChangeColorspace(mtOut->subtype, mtOut->formattype, mtOut->pbFormat, 0);
 		DeleteMediaType(mtOut);
 
 		if (result != S_OK)
@@ -1630,7 +1632,7 @@
 			hr = MFCreateAMMediaTypeFromMFMediaType(pType, GUID_NULL, &am);
 			
 			if (SUCCEEDED(hr)) {
-				if (FAILED(ChangeColorspace(am->subtype, am->formattype, am->pbFormat))) {
+				if (FAILED(ChangeColorspace(am->subtype, am->formattype, am->pbFormat, 1))) {
 					DPRINTF("(MFT)InternalCheckOutputType (MF_E_INVALIDTYPE)");
 					return MF_E_INVALIDTYPE;
 				}

xvidcore-1.3.0.tar.bz2/dshow/src/CXvidDecoder.h -> xvidcore-1.3.1.tar.bz2/dshow/src/CXvidDecoder.h Changed

xvidcore-1.3.0.tar.bz2/dshow/src/xvid.ico -> xvidcore-1.3.1.tar.bz2/dshow/src/xvid.ico Changed

xvidcore-1.3.0.tar.bz2/src/encoder.c -> xvidcore-1.3.1.tar.bz2/src/encoder.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: encoder.c,v 1.135.2.4 2011/02/03 15:12:34 Isibaar Exp $
+ * $Id: encoder.c,v 1.135.2.5 2011/03/08 19:18:44 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -1917,7 +1917,7 @@
 	if (!reference->is_edged) {	
 		start_timer();
 		image_setedges(pRef, pParam->edged_width, pParam->edged_height,
-					   pParam->width, pParam->height, 0);
+					   pParam->width, pParam->height, XVID_BS_VERSION);
 		stop_edges_timer();
 		reference->is_edged = 1;
 	}
@@ -2303,7 +2303,7 @@
 	if (!pEnc->reference->is_edged) {
 		image_setedges(f_ref, pEnc->mbParam.edged_width,
 					   pEnc->mbParam.edged_height, pEnc->mbParam.width,
-					   pEnc->mbParam.height, 0);
+					   pEnc->mbParam.height, XVID_BS_VERSION);
 		pEnc->reference->is_edged = 1;
 	}
 
@@ -2320,7 +2320,7 @@
 	if (!pEnc->current->is_edged) {
 		image_setedges(b_ref, pEnc->mbParam.edged_width,
 					   pEnc->mbParam.edged_height, pEnc->mbParam.width,
-					   pEnc->mbParam.height, 0);
+					   pEnc->mbParam.height, XVID_BS_VERSION);
 		pEnc->current->is_edged = 1;
 	}

xvidcore-1.3.0.tar.bz2/src/image/image.c -> xvidcore-1.3.1.tar.bz2/src/image/image.c Changed

@@ -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.46.2.1 2010/12/30 11:46:58 Isibaar Exp $
+ * $Id: image.c,v 1.46.2.3 2011/03/21 16:00:35 Isibaar Exp $
  *
  ****************************************************************************/
 
@@ -127,8 +127,10 @@
 	memcpy(image1->v, image2->v, edged_width * height / 4);
 }
 
-/* setedges bug was fixed in this BS version */
+/* setedges bug was in this BS versions */
 #define SETEDGES_BUG_BEFORE		18
+#define SETEDGES_BUG_AFTER		57
+#define SETEDGES_BUG_REFIXED		63
 
 void
 image_setedges(IMAGE * image,
@@ -149,7 +151,9 @@
 
 	/* According to the Standard Clause 7.6.4, padding is done starting at 16
 	 * pixel width and height multiples. This was not respected in old xvids */
-	if (bs_version >= SETEDGES_BUG_BEFORE) {
+	if ((bs_version >= SETEDGES_BUG_BEFORE &&
+		bs_version <  SETEDGES_BUG_AFTER) || 
+		bs_version >= SETEDGES_BUG_REFIXED) {
 		width  = (width+15)&~15;
 		height = (height+15)&~15;
 	}

xvidcore-1.3.0.tar.bz2/src/nasm.inc -> xvidcore-1.3.1.tar.bz2/src/nasm.inc Changed

xvidcore-1.3.0.tar.bz2/src/xvid.c -> xvidcore-1.3.1.tar.bz2/src/xvid.c Changed

xvidcore-1.3.0.tar.bz2/src/xvid.h -> xvidcore-1.3.1.tar.bz2/src/xvid.h Changed

Changes of Revision 3