diffstat for xvidcore-1.3.4 xvidcore-1.3.3 ChangeLog | 29 - build/generic/config.guess | 156 +++++---- build/generic/config.sub | 2 build/generic/configure | 18 - build/generic/configure.in | 2 build/win32/libxvidcore.vcproj | 43 +- debian/changelog | 499 ++++++++++++++++++------------- debian/clean | 1 debian/control | 50 --- debian/copyright | 106 ------ debian/gbp.conf | 3 debian/install | 1 debian/libxvidcore-dev.install | 6 debian/libxvidcore4.install | 1 debian/libxvidcore4.symbols | 12 debian/rules | 46 +- debian/source/format | 1 debian/watch | 5 dshow/src/CXvidDecoder.cpp | 252 +++++---------- dshow/src/CXvidDecoder.h | 16 dshow/src/config.c | 50 +-- dshow/src/config.h | 4 dshow/src/xvid.ico |binary src/encoder.c | 4 src/image/x86_asm/colorspace_rgb_mmx.asm | 22 - src/xvid.c | 4 src/xvid.h | 6 27 files changed, 617 insertions(+), 722 deletions(-) diff -Nru xvidcore-1.3.4/ChangeLog xvidcore-1.3.3/ChangeLog --- xvidcore-1.3.4/ChangeLog 2015-06-21 14:21:32.000000000 +0000 +++ xvidcore-1.3.3/ChangeLog 2014-04-08 20:41:05.000000000 +0000 @@ -1,31 +1,4 @@ -# Note that this ChangeLog covers only main changes to the release branch - -2015-06-14 21:18 Isibaar - * xvidcore/dshow/src/CXvidDecoder.cpp - xvidcore/dshow/src/CXvidDecoder.h - xvidcore/dshow/src/config.c - xvidcore/dshow/src/config.h: Fixed thumbnail creation under - Windows 10, faster rendering in MediaFoundation, various other - MFT-specific fixes... - -2015-06-11 02:51 Isibaar - * xvidcore/src/image/x86_asm/colorspace_rgb_mmx.asm: Attempt at - fixing a crash in RGB24->YV12 conversions - not yet really - tested... - -2015-06-08 21:15 Isibaar - * xvidcore/dshow/src/CXvidDecoder.cpp - xvidcore/dshow/src/CXvidDecoder.h: Changed friendly name of - MFT to match common conventions. - -2014-11-26 00:17 Isibaar - * xvidcore/src/encoder.c: Fix for multi-threading bug in case of - input video height <= 16 pixels. Patch by Lukasz Marek. - -2014-09-25 19:41 Isibaar - - * xvidcore/build/win32/libxvidcore.vcproj: Enabled multi-threaded - builds in MSVC by default +# Note that this ChangeLog covers only changes to the release branch 2014-03-05 08:37 Isibaar diff -Nru xvidcore-1.3.4/build/generic/config.guess xvidcore-1.3.3/build/generic/config.guess --- xvidcore-1.3.4/build/generic/config.guess 2015-06-21 14:21:32.000000000 +0000 +++ xvidcore-1.3.3/build/generic/config.guess 2014-04-08 20:41:05.000000000 +0000 @@ -153,6 +153,16 @@ ;; 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 @@ -217,23 +227,23 @@ exit ;; *:Bitrig:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + 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 @@ -301,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]:*:*) - echo ${UNAME_MACHINE}-unknown-morphos + echo ${UNAME_MACHINE}-${VENDOR}-morphos exit ;; *:OS/390:*:*) echo i370-ibm-openedition @@ -322,7 +332,7 @@ echo arm-acorn-riscix${UNAME_RELEASE} exit ;; arm*:riscos:*:*|arm*:RISCOS:*:*) - echo arm-unknown-riscos + echo arm-${VENDOR}-riscos exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) echo hppa1.1-hitachi-hiuxmpp @@ -430,7 +440,7 @@ echo m68k-hades-mint${UNAME_RELEASE} exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} + echo m68k-${VENDOR}-mint${UNAME_RELEASE} exit ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} @@ -741,9 +751,9 @@ exit ;; i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk + echo ${UNAME_MACHINE}-${VENDOR}-osf1mk else - echo ${UNAME_MACHINE}-unknown-osf1 + echo ${UNAME_MACHINE}-${VENDOR}-osf1 fi exit ;; parisc*:Lites*:*:*) @@ -803,18 +813,18 @@ echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} exit ;; sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi${UNAME_RELEASE} + echo sparc-${VENDOR}-bsdi${UNAME_RELEASE} exit ;; *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + echo ${UNAME_MACHINE}-${VENDOR}-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) UNAME_PROCESSOR=`/usr/bin/uname -p` case ${UNAME_PROCESSOR} in amd64) - echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + echo x86_64-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; *) - echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + echo ${UNAME_PROCESSOR}-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; esac exit ;; i*:CYGWIN*:*) @@ -842,10 +852,10 @@ echo i586-pc-interix${UNAME_RELEASE} exit ;; authenticamd | genuineintel | EM64T) - echo x86_64-unknown-interix${UNAME_RELEASE} + echo x86_64-${VENDOR}-interix${UNAME_RELEASE} exit ;; IA64) - echo ia64-unknown-interix${UNAME_RELEASE} + echo ia64-${VENDOR}-interix${UNAME_RELEASE} exit ;; esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) @@ -864,31 +874,31 @@ echo ${UNAME_MACHINE}-pc-uwin exit ;; amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) - echo x86_64-unknown-cygwin + echo x86_64-${VENDOR}-cygwin exit ;; p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin + echo powerpcle-${VENDOR}-cygwin exit ;; prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo powerpcle-${VENDOR}-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-${VENDOR}-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} + echo ${UNAME_MACHINE}-${VENDOR}-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} exit ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in @@ -902,29 +912,29 @@ esac objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC="gnulibc1" ; fi - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} exit ;; arc:Linux:*:* | arceb:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi + echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}eabi else - echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf + echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}eabihf fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} exit ;; cris:Linux:*:*) echo ${UNAME_MACHINE}-axis-linux-${LIBC} @@ -933,22 +943,22 @@ echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} exit ;; hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} exit ;; i*86:Linux:*:*) echo ${UNAME_MACHINE}-pc-linux-${LIBC} exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} exit ;; mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build @@ -967,63 +977,63 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } + test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-${LIBC}"; exit; } ;; or1k:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} exit ;; or32:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-${LIBC} + echo sparc-${VENDOR}-linux-${LIBC} exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-${LIBC} + echo hppa64-${VENDOR}-linux-${LIBC} exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; - PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; - *) echo hppa-unknown-linux-${LIBC} ;; + PA7*) echo hppa1.1-${VENDOR}-linux-${LIBC} ;; + PA8*) echo hppa2.0-${VENDOR}-linux-${LIBC} ;; + *) echo hppa-${VENDOR}-linux-${LIBC} ;; esac exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-${LIBC} + echo powerpc64-${VENDOR}-linux-${LIBC} exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-${LIBC} + echo powerpc-${VENDOR}-linux-${LIBC} exit ;; ppc64le:Linux:*:*) - echo powerpc64le-unknown-linux-${LIBC} + echo powerpc64le-${VENDOR}-linux-${LIBC} exit ;; ppcle:Linux:*:*) - echo powerpcle-unknown-linux-${LIBC} + echo powerpcle-${VENDOR}-linux-${LIBC} exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} exit ;; vax:Linux:*:*) echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -1045,16 +1055,16 @@ echo ${UNAME_MACHINE}-pc-os2-emx exit ;; i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop + echo ${UNAME_MACHINE}-${VENDOR}-stop exit ;; i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos + echo ${UNAME_MACHINE}-${VENDOR}-atheos exit ;; i*86:syllable:*:*) echo ${UNAME_MACHINE}-pc-syllable exit ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} + echo i386-${VENODR}-lynxos${UNAME_RELEASE} exit ;; i*86:*DOS:*:*) echo ${UNAME_MACHINE}-pc-msdosdjgpp @@ -1074,7 +1084,7 @@ *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac - echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} + echo ${UNAME_MACHINE}-${VENDOR}-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} exit ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then @@ -1113,7 +1123,7 @@ if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 + echo i860-${VENODR}-sysv${UNAME_RELEASE} # Unknown i860-SVR4 fi exit ;; mini*:CTIX:SYS*5:*) @@ -1150,19 +1160,19 @@ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} + echo m68k-${VENDOR}-lynxos${UNAME_RELEASE} exit ;; mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 exit ;; TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos${UNAME_RELEASE} + echo sparc-${VENDOR}-lynxos${UNAME_RELEASE} exit ;; rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} + echo rs6000-${VENDOR}-lynxos${UNAME_RELEASE} exit ;; PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} + echo powerpc-${VENDOR}-lynxos${UNAME_RELEASE} exit ;; SM[BE]S:UNIX_SV:*:*) echo mips-dde-sysv${UNAME_RELEASE} @@ -1212,7 +1222,7 @@ if [ -d /usr/nec ]; then echo mips-nec-sysv${UNAME_RELEASE} else - echo mips-unknown-sysv${UNAME_RELEASE} + echo mips-${VENDOR}-sysv${UNAME_RELEASE} fi exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. @@ -1228,7 +1238,7 @@ echo i586-pc-haiku exit ;; x86_64:Haiku:*:*) - echo x86_64-unknown-haiku + echo x86_64-${VENDOR}-haiku exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} @@ -1311,13 +1321,13 @@ else UNAME_MACHINE="$cputype" fi - echo ${UNAME_MACHINE}-unknown-plan9 + echo ${UNAME_MACHINE}-${VENDOR}-plan9 exit ;; *:TOPS-10:*:*) - echo pdp10-unknown-tops10 + echo pdp10-${VENDOR}-tops10 exit ;; *:TENEX:*:*) - echo pdp10-unknown-tenex + echo pdp10-${VENDOR}-tenex exit ;; KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) echo pdp10-dec-tops20 @@ -1326,16 +1336,16 @@ echo pdp10-xkl-tops20 exit ;; *:TOPS-20:*:*) - echo pdp10-unknown-tops20 + echo pdp10-${VENDOR}-tops20 exit ;; *:ITS:*:*) - echo pdp10-unknown-its + echo pdp10-${VENDOR}-its exit ;; SEI:*:*:SEIUX) echo mips-sei-seiux${UNAME_RELEASE} exit ;; *:DragonFly:*:*) - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + echo ${UNAME_MACHINE}-${VENDOR}-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit ;; *:*VMS:*:*) UNAME_MACHINE=`(uname -p) 2>/dev/null` @@ -1357,7 +1367,7 @@ echo ${UNAME_MACHINE}-pc-aros exit ;; x86_64:VMkernel:*:*) - echo ${UNAME_MACHINE}-unknown-esx + echo ${UNAME_MACHINE}-${VENDOR}-esx exit ;; esac diff -Nru xvidcore-1.3.4/build/generic/config.sub xvidcore-1.3.3/build/generic/config.sub --- xvidcore-1.3.4/build/generic/config.sub 2015-06-21 14:21:32.000000000 +0000 +++ xvidcore-1.3.3/build/generic/config.sub 2014-04-08 20:41:05.000000000 +0000 @@ -1006,7 +1006,7 @@ ;; ppc64) basic_machine=powerpc64-unknown ;; - ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppc64le | powerpc64little | ppc64-le | powerpc64-little) basic_machine=powerpc64le-unknown diff -Nru xvidcore-1.3.4/build/generic/configure xvidcore-1.3.3/build/generic/configure --- xvidcore-1.3.4/build/generic/configure 2015-06-21 14:21:32.000000000 +0000 +++ xvidcore-1.3.3/build/generic/configure 2014-04-08 20:41:05.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Xvid 1.3.4. +# Generated by GNU Autoconf 2.69 for Xvid 1.3.3. # # Report bugs to . # @@ -580,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='Xvid' PACKAGE_TARNAME='xvid' -PACKAGE_VERSION='1.3.4' -PACKAGE_STRING='Xvid 1.3.4' +PACKAGE_VERSION='1.3.3' +PACKAGE_STRING='Xvid 1.3.3' PACKAGE_BUGREPORT='xvid-devel@xvid.org' PACKAGE_URL='' @@ -1277,7 +1277,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.3.4 to adapt to many kinds of systems. +\`configure' configures Xvid 1.3.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1343,7 +1343,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Xvid 1.3.4:";; + short | recursive ) echo "Configuration of Xvid 1.3.3:";; esac cat <<\_ACEOF @@ -1434,7 +1434,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Xvid configure 1.3.4 +Xvid configure 1.3.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1919,7 +1919,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.3.4, which was +It was created by Xvid $as_me 1.3.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -5600,7 +5600,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Xvid $as_me 1.3.4, which was +This file was extended by Xvid $as_me 1.3.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5653,7 +5653,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Xvid config.status 1.3.4 +Xvid config.status 1.3.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru xvidcore-1.3.4/build/generic/configure.in xvidcore-1.3.3/build/generic/configure.in --- xvidcore-1.3.4/build/generic/configure.in 2015-06-21 14:21:32.000000000 +0000 +++ xvidcore-1.3.3/build/generic/configure.in 2014-04-08 20:41:05.000000000 +0000 @@ -8,7 +8,7 @@ AC_PREREQ([2.50]) -AC_INIT([Xvid], [1.3.4], [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. diff -Nru xvidcore-1.3.4/build/win32/libxvidcore.vcproj xvidcore-1.3.3/build/win32/libxvidcore.vcproj --- xvidcore-1.3.4/build/win32/libxvidcore.vcproj 2015-06-21 14:21:32.000000000 +0000 +++ xvidcore-1.3.3/build/win32/libxvidcore.vcproj 2014-04-08 20:41:05.000000000 +0000 @@ -1,10 +1,9 @@ @@ -109,6 +106,9 @@ Name="VCAppVerifierTool" /> + @@ -147,7 +147,7 @@ AdditionalOptions="/Qipo " Optimization="2" InlineFunctionExpansion="1" - PreprocessorDefinitions="NDEBUG;HAVE_PTHREAD;ARCH_IS_X86_64;WIN32;_WINDOWS;ARCH_IS_64BIT;_CRT_SECURE_NO_WARNINGS" + PreprocessorDefinitions="NDEBUG;ARCH_IS_X86_64;WIN32;_WINDOWS;ARCH_IS_64BIT;_CRT_SECURE_NO_WARNINGS" StringPooling="true" RuntimeLibrary="0" EnableFunctionLevelLinking="true" @@ -178,8 +178,6 @@ ModuleDefinitionFile="..\generic\libxvidcore.def" ProgramDatabaseFile="$(IntDir)/xvidcore.pdb" SubSystem="2" - RandomizedBaseAddress="1" - DataExecutionPrevention="0" ImportLibrary="bin\x64\xvidcore.dll.a" TargetMachine="17" /> @@ -204,6 +202,9 @@ Name="VCAppVerifierTool" /> + @@ -240,7 +241,7 @@ @@ -299,6 +298,9 @@ Name="VCAppVerifierTool" /> + @@ -335,7 +337,7 @@ @@ -394,6 +394,9 @@ Name="VCAppVerifierTool" /> + @@ -425,11 +428,11 @@ > + + @@ -3489,10 +3496,6 @@ - - = 9). - * Bump Standards-Version to 3.9.6. - * Refrain from mangling CFLAGS in debian/confflags, move the remainder - of this file into debian/rules. - * Remove debian/source/local-options, they are default now. + * New upstream bugfix release. - -- Fabian Greffrath Mon, 29 Jun 2015 09:47:36 +0200 + -- Christian Marillat Sun, 13 Apr 2014 08:38:45 +0200 -xvidcore (2:1.3.3-1) unstable; urgency=medium +xvidcore (3:1.3.2-dmo1) unstable; urgency=low - * Team upload. + * Build with hardened flags. - [ Alessio Treglia ] - * Use the autotools-dev dh addon to update config.guess/config.sub for arm64. - Thanks to Colin Watson for the report and patch. (Closes: #726428) + -- Christian Marillat Wed, 20 Jun 2012 17:06:35 +0200 - [ Fabian Greffrath ] - * Imported Upstream version 1.3.3 - * Remove all patches, applied upstream. - * Remove Andres Mejia from Uploaders list (Closes: #743557). +xvidcore (3:1.3.2-0.6) unstable; urgency=low - [ IOhannes m zmölnig ] - * Bumped standards version to 3.9.5 - * Removed deprecated "DM-Upload-Allowed" + * debian/control correctly set yasm in Build-Depends. - -- IOhannes m zmölnig (Debian/GNU) Tue, 22 Apr 2014 13:11:17 +0200 + -- Christian Marillat Tue, 03 Apr 2012 22:31:22 +0200 -xvidcore (2:1.3.2-9) unstable; urgency=low +xvidcore (3:1.3.2-0.5) unstable; urgency=low - * Pass hardened CPPFLAGS to CFLAGS. (Closes: #664512) + * Added Multi-Arch: field in debian/control. - -- Andres Mejia Sun, 18 Mar 2012 10:15:39 -0400 + -- Christian Marillat Tue, 03 Apr 2012 10:39:35 +0200 -xvidcore (2:1.3.2-8) unstable; urgency=low +xvidcore (3:1.3.2-0.4) unstable; urgency=low - * Add in hardened CFLAGS. + * Added ccache in Build-depends. - -- Andres Mejia Sat, 17 Mar 2012 13:49:24 -0400 + -- Christian Marillat Thu, 28 Jul 2011 03:07:19 +0200 -xvidcore (2:1.3.2-7) unstable; urgency=low +xvidcore (3:1.3.2-0.3) unstable; urgency=low - * Allow dev package to be multiarch installable. - * Bump to Standards-Version 3.9.3. + * Changes -dev package name to libxvidcore-dev. - -- Andres Mejia Fri, 16 Mar 2012 18:33:18 -0400 + -- Christian Marillat Wed, 27 Jul 2011 07:23:30 +0200 -xvidcore (2:1.3.2-6) unstable; urgency=low +xvidcore (2:1.3.2-0.2) unstable; urgency=low - * Convert package to support multiarch library. + * debian/rules Add missing --prefix configure option and remove empty -j + make option. - -- Andres Mejia Sat, 17 Sep 2011 12:36:05 -0400 + -- Christian Marillat Mon, 27 Jun 2011 18:34:31 +0200 -xvidcore (2:1.3.2-5) unstable; urgency=low +xvidcore (2:1.3.2-0.1) unstable; urgency=low - * Introduce a debian/confflags file to conditionally disable - assembly optimizations on certain archs until we introduce flavours. - * Disable yasm support for kfreebsd-amd64 again, it is known - to be broken and also disabled in FreeBSD (Closes: #635719). + * Build for multiarch. - -- Fabian Greffrath Fri, 29 Jul 2011 10:07:49 +0200 + -- Christian Marillat Mon, 27 Jun 2011 15:29:55 +0200 -xvidcore (2:1.3.2-4) unstable; urgency=low +xvidcore (2:1.3.2-0.0) unstable; urgency=low - * Add patch by Pino Toscano to add support for GNU Hurd as target OS, - requires running autoconf (Closes: #635662). - * Extend Build-Depends on yasm to [any-i386 any-amd64]. + * New upstream release. + + -- Christian Marillat Tue, 31 May 2011 19:12:44 +0200 + +xvidcore (2:1.3.1-0.0) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Fri, 25 Mar 2011 08:46:40 +0100 + +xvidcore (2:1.3.0-0.0) unstable; urgency=low + + * New upstream release. + * debian/control doesn't build with yasm for kfreebsd-amd64, only with nasm. + + -- Christian Marillat Thu, 24 Feb 2011 10:42:00 +0100 + +xvidcore (2:1.2.2-0.1) unstable; urgency=low + + * debian/watch updated, should work now. + * Updated patch from Russell Coker to not demand an executable stack. + + -- Christian Marillat Sun, 24 Jan 2010 13:21:34 +0100 + +xvidcore (2:1.2.2-0.0) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Fri, 29 May 2009 14:48:31 +0200 + +xvidcore (2:1.2.1-0.0) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Wed, 29 Apr 2009 14:49:06 +0200 + +xvidcore (2:1.1.3-0.6) unstable; urgency=low + + * Patch from Russell Coker to not demand an executable stack. + + -- Christian Marillat Mon, 12 Jan 2009 15:47:42 +0100 + +xvidcore (2:1.1.3-0.5) unstable; urgency=high + + * Do not rerun build/generic/bootstrap.sh but instead update config.sub + and config.guess otherwise the configure script doesn't find yasm for + amd64 arch. + * Patch configure (doesn't find nasm). + + -- Christian Marillat Sat, 03 May 2008 21:12:05 +0200 + +xvidcore (2:1.1.3-0.4) unstable; urgency=low + + * Move to quilt. + * Added Homepage field. + * Re-run build/generic/bootstrap.sh - -- Fabian Greffrath Thu, 28 Jul 2011 09:46:20 +0200 + -- Christian Marillat Wed, 09 Apr 2008 17:18:45 +0200 -xvidcore (2:1.3.2-3) unstable; urgency=low +xvidcore (2:1.1.3-0.3) unstable; urgency=low - * Fix typo to location of LGPL-2 on Debian systems. + * Of course nasm is for i386 only. Last uplaod for today :) - -- Andres Mejia Tue, 26 Jul 2011 06:50:31 -0400 + -- Christian Marillat Wed, 05 Sep 2007 10:24:56 +0200 -xvidcore (2:1.3.2-2) unstable; urgency=low +xvidcore (2:1.1.3-0.2) unstable; urgency=low - [ Fabian Greffrath ] - * Build-Depend on yasm. A recent enough version is in Debian now and - the configure script prefers it over nasm. - - [ Reinhard Tartler ] - * document copyright and license of altivec assembler + * Add nasm in Build-Depends. - -- Reinhard Tartler Tue, 26 Jul 2011 11:02:05 +0200 + -- Christian Marillat Wed, 05 Sep 2007 10:20:48 +0200 -xvidcore (2:1.3.2-1) unstable; urgency=low +xvidcore (2:1.1.3-0.1) unstable; urgency=high - [ Fabian Greffrath ] - * Imported Upstream version 1.3.2 (Closes: #531040) - + dropped the debian/ directory from release tarballs. - + updated the configure helper scripts. - + Makefile does not include platform.inc in clean rules anymore. - + Makefile now shows build infos in the default build rule. + * Add support for NCPUS and set urgency to high (CVE-2007-3329). - [ Andres Mejia ] - * Update to my @debian.org email. - * Update debian/copyright to reflect licensing of new upstream release. - * Update debian/copyright to DEP-5 spec. + -- Christian Marillat Wed, 05 Sep 2007 09:34:57 +0200 - -- Andres Mejia Mon, 25 Jul 2011 21:07:23 -0400 +xvidcore (2:1.1.3-0.0) unstable; urgency=low -xvidcore (2:1.3.1-1) UNRELEASED; urgency=low + * New upstream release. + + -- Christian Marillat Wed, 05 Sep 2007 09:19:14 +0200 + +xvidcore (2:1.1.2-0.1) unstable; urgency=low + + * New patch to fix build on ia64. - [ Fabian Greffrath ] - * Imported Upstream version 1.3.1 - * Remove configure.in-fix.patch and no-exec-stack-elf32.patch, - applied upstream. - * Upstream updated their configure script, so drop autoconf. - * Update debian/gbp.conf and document filtering in git-import-orig. - * Fix so-symlink in debian/libxvidcore-dev.links. - * Simplify the changes to show build options during build. + -- Christian Marillat Thu, 2 Nov 2006 14:01:17 +0100 - [ Andres Mejia ] - * Show build options during build. - * Simplify setting of CFLAGS. - * Bump to Standards-Version 3.9.2. - * Fix description-synopsis-starts-with-article lintian warnings. - * Support parallel builds. - * Enable -O3 instead of -O2. - * Include Vcs-* entries. - * Add DM-Upload-Allowed: yes. - * Include local options to unapply all patches and abort on any upstream - changes. +xvidcore (2:1.1.2-0.0) unstable; urgency=low - -- Andres Mejia Tue, 03 May 2011 18:56:05 -0400 + * New upstream release. + + -- Christian Marillat Wed, 1 Nov 2006 16:27:54 +0100 -xvidcore (2:1.3.0-1) UNRELEASED; urgency=low +xvidcore (2:1.1.0-final-0.1) unstable; urgency=low - * Imported Upstream version 1.3.0 - * Use 3.0 (quilt) source format. - * Refresh build system patches. - * yasm (> 1.0) is required but not in Debian yet, - build-depend on nasm (>= 2.0) - * Avoid running configure in the clean rule. - * Remove unused lintian overrides. - * Fix ldconfig-symlink-referencing-wrong-file. - * Update libxvidcore4.symbols file. - * Drop build-system-update.patch, use autotools-dev and autoconf - at build-time instead. - * Backup and restore build/generic/configure instead of removing it. - * Really disable the executable bit for GNU-stack for elf32 archs. + * Patch to fix ia64 build. Thanks to Thibaut VARENE. - -- Fabian Greffrath Fri, 25 Feb 2011 11:49:07 +0100 + -- Christian Marillat Sun, 7 May 2006 13:08:28 +0200 -xvidcore (2:1.2.2+debian-3) UNRELEASED; urgency=low +xvidcore (2:1.1.0-final-0.0) unstable; urgency=low + + * New upstream release. - [ Fabian Greffrath ] - * Update my e-mail address. - * Make use of dh --sourcedirectory, instead of overriding all of - dh_auto_*. - * Remove ltmain.sh from debian/patches/build-system-update.patch, - xvidcore does not even use libtool. - * Update debian/patches/build-system-update.patch with a recent - autoconf and autotools-dev. + -- Christian Marillat Thu, 12 Jan 2006 09:20:35 +0100 - [ Andres Mejia ] - * Fix issue where autoconf outputs badly formatted configure script. - * Update build-system-update.patch description with instructions on - how to update build system. - * Update Standards-Version to 3.9.1. No changes needed. +xvidcore (2:1.1.0-beta2+cvs-0.0) unstable; urgency=low - -- Andres Mejia Sat, 11 Sep 2010 15:38:00 -0400 + * Patch from CVS to fix build problem with amd64. + * Patch to not build with -freduce-all-givs -xvidcore (2:1.2.2+debian-2) unstable; urgency=low + -- Christian Marillat Thu, 22 Sep 2005 02:47:35 -0700 - [ Maia Kozheva ] - * Merged README.Source and README.source. +xvidcore (2:1.1.0-beta2-0.0) unstable; urgency=low - [ Reinhard Tartler ] - * Upload to Debian, Closes: #531040 + * New upstream release - -- Reinhard Tartler Sat, 31 Jul 2010 21:52:24 -0400 + -- Christian Marillat Mon, 25 Apr 2005 12:43:51 +0200 -xvidcore (2:1.2.2+debian-1ubuntu2) maverick; urgency=low +xvidcore (2:1.1.0-beta1-0.1) unstable; urgency=low - * Really merge README.Source and README.source now. + * From Guido, in debian/control : + o Type architectures must be seperated by space, not comma - -- Maia Kozheva Sat, 05 Jun 2010 18:02:44 +0700 + -- Christian Marillat Fri, 22 Apr 2005 15:15:18 +0200 -xvidcore (2:1.2.2+debian-1ubuntu1) maverick; urgency=low +xvidcore (2:1.1.0-beta1-0.0) unstable; urgency=low - * Merged from debian-unofficial release 2:1.2.2+debian-1, remaining - Ubuntu changes: - - Merged README.Source and README.source. + * New upstream release - -- Maia Kozheva Sat, 05 Jun 2010 17:47:10 +0700 + -- Christian Marillat Sat, 26 Mar 2005 00:01:05 +0100 -xvidcore (2:1.2.2+debian-1) unstable; urgency=low +xvidcore (2:1.0.3-0.0) unstable; urgency=low - * Prepare release for Debian. - * Set appropriate debian-branch default for master branch. - * Fix Maintainer field and set myself as an uploader. - * Bump Standards-Version to 4. - * Remove dependence on cdbs and just use debhelper. - * Update the build system via a quilt patch. - * Add lintian overrides with appropriate messages for overrides. + * New upstream release - -- Andres Mejia Sat, 08 May 2010 01:37:15 -0400 + -- Christian Marillat Sat, 25 Dec 2004 07:06:28 +0100 -xvidcore (2:1.2.2+debian-0ubuntu2) lucid; urgency=low +xvidcore (2:1.0.2-0.1) unstable; urgency=low - * Non-exec patches got broken upstream by invoking yasm -f elf64/elf32, - so the __OUTPUT_FORMAT__==elf test no longer works. Instead, trigger - the section in the global include file, thanks to Russell Coker - (LP: #530876). + * The lib package Provides libxvidcore and the -dev package libxvidcore-dev - -- Kees Cook Tue, 02 Mar 2010 11:20:39 -0800 + -- Christian Marillat Wed, 24 Nov 2004 17:52:37 +0100 + +xvidcore (2:1.0.2-0.0) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Sun, 5 Sep 2004 10:38:57 +0200 + +xvidcore (2:1.0.1-0.0) unstable; urgency=low + + * New upstream release. -xvidcore (2:1.2.2+debian-0ubuntu1) lucid; urgency=low + -- Christian Marillat Tue, 8 Jun 2004 09:37:08 +0200 - * Fakesynced new upstream release from the debian-multimedia git repository. - (LP: #306399) - * Dropped Ubuntu patches, all applied upstream: - - 01_ia64_fix.dpatch - - 50_non-exec-stack.dpatch - - CVE-2007-3329.dpatch +xvidcore (2:1.0.0-0.0) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Tue, 18 May 2004 14:56:43 +0200 + +xvidcore (1:1.0.0-rc4-0.0) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Tue, 6 Apr 2004 15:25:57 +0200 + +xvidcore (1:1.0.0-rc2-0.0) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Sun, 8 Feb 2004 22:49:17 +0100 + +xvidcore (1:1.0.0-rc1-0.0) unstable; urgency=low + + * New upstream release. - -- Maia Kozheva Fri, 20 Nov 2009 12:48:09 +0600 + -- Christian Marillat Sat, 7 Feb 2004 16:39:26 +0100 -xvidcore (1.2.2+debian-0debimedia1) unstable; urgency=low +xvidcore (1:1.0.0-beta3-0.0) unstable; urgency=low - * Added debian/README.Source. - * Updated Maintainer and Uploaders fields. - * Build-Depend on yasm (>= 0.8), since it's in squeeze now. - * Bumped Standards-Version to 3.8.2. + * News Beta release. - -- Fabian Greffrath Wed, 12 Aug 2009 08:38:39 +0200 + -- Christian Marillat Sun, 28 Dec 2003 14:43:28 +0100 -xvidcore (1.2.2+debian-0fab5) unstable; urgency=low +xvidcore (1:1.0.0-beta2-0.0) unstable; urgency=low - * debian/copyright: Finalized. + * News Beta release. - -- Fabian Greffrath Fri, 26 Jun 2009 09:00:00 +0200 + -- Christian Marillat Sat, 20 Dec 2003 23:32:59 +0100 -xvidcore (1.2.2+debian-0fab4) unstable; urgency=low +xvidcore (1:0.9.2-0.3) unstable; urgency=low - * debian/control: Prefer yasm (>= 0.8) over nasm (>= 2.0). - * debian/copyright: Simplified. + * Add a versioned shlibs and remove generated libxvidcore.def - -- Fabian Greffrath Thu, 25 Jun 2009 11:00:00 +0200 + -- Christian Marillat Fri, 22 Aug 2003 00:53:38 +0200 -xvidcore (1.2.2+debian-0fab3) unstable; urgency=low +xvidcore (1:0.9.2-0.2) unstable; urgency=low - * debian/control, debian/rules: Ported from debhelper (>= 7.2) to cdbs. - * debian/control: Wrapped Build-Depends and Depends fields. - * debian/control: Removed Build-Depends on quilt. - * debian/patches/: Removed. + * Forgot to change the internal library name. - -- Fabian Greffrath Wed, 24 Jun 2009 16:30:00 +0200 + -- Christian Marillat Fri, 22 Aug 2003 00:53:34 +0200 -xvidcore (1.2.2+debian-0fab2) unstable; urgency=low +xvidcore (1:0.9.2-0.1) unstable; urgency=low - * debian/control: Bumped Build-Depends to debhelper (>= 7.2). - * debian/control: Adjusted Build-Depends on nasm and yasm. - * debian/copyright: Improved based on an approach by - Loïc Martin . - * debian/libxvidcore4.symbols: Added. - * debian/rules: Added reasonable defaults to CFLAGS. - * debian/rules: Added execute permissions to the configure script - after the patch rule instead of before the configure rule. - * debian/watch: Added. + * debian/control libxvidcore-dev should depends on libxvidcore2 not libxvidencore2 - -- Fabian Greffrath Wed, 24 Jun 2009 15:00:00 +0200 + -- Christian Marillat Thu, 21 Aug 2003 22:58:11 +0200 -xvidcore (1.2.2+debian-0fab1) unstable; urgency=low +xvidcore (1:0.9.2-0.0) unstable; urgency=low * New upstream release. + * Install example files in the -doc packages. + * Change package name to libxvidcore2, libxvidcore-dev and libxvidcore-doc + + -- Christian Marillat Thu, 21 Aug 2003 22:43:12 +0200 + +xvidcore (1:0.9.1-0.2) unstable; urgency=low + + * Some package re-arrangement before packaging 0.9.2 + + -- Christian Marillat Wed, 20 Aug 2003 15:23:24 +0200 + +xvidcore (1:0.9.1-0.1) unstable; urgency=low + + * Change section for -doc package. + * Include portab.h + + -- Christian Marillat Fri, 11 Jul 2003 10:25:24 +0200 + +xvidcore (1:0.9.1-0.0) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Sat, 15 Feb 2003 17:33:56 +0100 + +xvidcore (1:0.9.0-0.4) unstable; urgency=low + + * debian/control Change Architecture to any + + -- Christian Marillat Tue, 11 Feb 2003 01:01:20 +0100 + +xvidcore (1:0.9.0-0.3) unstable; urgency=low + + * Add sparc build and fix ia64 + + -- Christian Marillat Tue, 11 Feb 2003 00:34:20 +0100 + +xvidcore (1:0.9.0-0.2) unstable; urgency=low + + * Use the right Makefile for ppc and ia64. + + -- Christian Marillat Tue, 21 Jan 2003 21:44:55 +0100 + +xvidcore (1:0.9.0-0.1) unstable; urgency=low + + * Bump Standards-Version to 3.5.8 + * Add a new -doc package. + * Remove gcc-3.2 build-dependency now gcc-3.2 is the default gcc + + -- Christian Marillat Tue, 7 Jan 2003 23:39:53 +0100 + +xvidcore (1:0.9.0-0.0) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Wed, 27 Nov 2002 01:05:39 +0100 + +xvid (20020822-0.0) unstable; urgency=low + + * New cvs snapshot. + * Build with gcc-3.2 + + -- Christian Marillat Mon, 23 Sep 2002 15:48:08 +0200 + +xvid (20020728-0.0) unstable; urgency=low + + * New cvs snapshot. + * Add DEB_BUILD_OPTIONS support + + -- Christian Marillat Wed, 14 Aug 2002 18:21:31 +0200 + +xvid (20020412-2) unstable; urgency=low + + * Add divx4.h in the package. + + -- Christian Marillat Tue, 6 Aug 2002 15:34:00 +0200 + +xvid (20020412-1) unstable; urgency=low + + * New cvs snapshot. + + -- Christian Marillat Fri, 12 Apr 2002 11:49:15 +0200 + +xvid (20020404-1) unstable; urgency=low + + * New cvs snapshot. + + -- Christian Marillat Sun, 7 Apr 2002 15:13:18 +0200 + +xvid (20020317-1) unstable; urgency=low + + * New cvs snapshot. + + -- Christian Marillat Wed, 27 Mar 2002 15:07:57 +0100 + +xvid (20020121-2) unstable; urgency=low + + * Include the header file. + * Don't compile for pentium-pro + + -- Christian Marillat Mon, 4 Mar 2002 18:39:53 +0100 + +xvid (20020121-1) unstable; urgency=low + + * New cvs snapshot. + + -- Christian Marillat Mon, 11 Feb 2002 18:52:55 +0100 + +xvid (20020120-1) unstable; urgency=low + + * New cvs snapshot. + + -- Christian Marillat Mon, 21 Jan 2002 19:15:41 +0100 + +xvid (20020105-1) unstable; urgency=low + + * New cvs snapshot. + + -- Christian Marillat Sat, 12 Jan 2002 15:29:23 +0100 - -- Fabian Greffrath Tue, 02 Jun 2009 00:00:00 +0200 +xvid (20011128-1) unstable; urgency=low -xvidcore (1.2.1+debian-0fab1) unstable; urgency=low + * Initial Release. - * Initial release. - * Rebuilt upstream tarball without debian/ directory. - * Patched a build environment into the top level source directory. + -- Christian Marillat Fri, 30 Nov 2001 16:42:45 +0100 - -- Fabian Greffrath Mon, 01 Jun 2009 00:00:00 +0200 +Local variables: +mode: debian-changelog +End: diff -Nru xvidcore-1.3.4/debian/clean xvidcore-1.3.3/debian/clean --- xvidcore-1.3.4/debian/clean 2015-06-29 07:17:59.000000000 +0000 +++ xvidcore-1.3.3/debian/clean 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -build/generic/configure diff -Nru xvidcore-1.3.4/debian/control xvidcore-1.3.3/debian/control --- xvidcore-1.3.4/debian/control 2015-06-29 07:45:34.000000000 +0000 +++ xvidcore-1.3.3/debian/control 2016-09-23 00:49:18.000000000 +0000 @@ -1,47 +1,29 @@ Source: xvidcore Section: libs Priority: optional -Maintainer: Debian Multimedia Maintainers -Uploaders: Loïc Martin , - Reinhard Tartler , - Fabian Greffrath -Build-Depends: debhelper (>= 9), - yasm (>= 1.0) [any-i386 amd64], - autoconf, - autotools-dev -Standards-Version: 3.9.6 +Maintainer: Christian Marillat +Bugs: mailto:marillat@deb-multimedia.org Homepage: http://www.xvid.org/ -Vcs-Git: git://anonscm.debian.org/pkg-multimedia/xvidcore.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/xvidcore.git +Standards-Version: 3.9.5 +Build-Conflicts: yasm [kfreebsd-amd64] +Build-Depends: debhelper (>= 9), nasm [kfreebsd-amd64], ccache, + yasm [amd64 any-i386] Package: libxvidcore4 Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} -Depends: ${shlibs:Depends}, - ${misc:Depends} -Description: Open source MPEG-4 video codec (library) - Xvid (formerly XviD) is an open source MPEG-4 video codec, implementing MPEG-4 - Simple Profile, Advanced Simple Profile, and Advanced Video Coding standards. - It is written in C with assembler optimizations for quality and speed - (including MMX, SSE, and 3Dnow! code for i386 and AltiVec for PowerPC), and is - especially optimized towards offline, multi-pass compression for storage and - archival purposes. - . - This package contains the shared library. +Depends: ${shlibs:Depends}, ${misc:Depends} +Provides: libxvidcore +Description: High quality ISO MPEG4 codec library + XviD is a high quality/performance ISO MPEG4 codec. Package: libxvidcore-dev -Section: libdevel Architecture: any Multi-Arch: same -Depends: libxvidcore4 (= ${binary:Version}), - ${misc:Depends} -Description: Open source MPEG-4 video codec (development) - Xvid (formerly XviD) is an open source MPEG-4 video codec, implementing MPEG-4 - Simple Profile, Advanced Simple Profile, and Advanced Video Coding standards. - It is written in C with assembler optimizations for quality and speed - (including MMX, SSE, and 3Dnow! code for i386 and AltiVec for PowerPC), and is - especially optimized towards offline, multi-pass compression for storage and - archival purposes. - . - This package contains the development files. +Depends: libxvidcore4 (= ${binary:Version}), ${misc:Depends} +Section: libdevel +Replaces: libxvidencore0 (<= 1:0.9.1-0.1), libxvidcore4-dev +Conflicts: libxvidencore-dev, libxvidcore4-dev +Description: High quality ISO MPEG4 codec library -- development files + XviD is a high quality/performance ISO MPEG4 codec. diff -Nru xvidcore-1.3.4/debian/copyright xvidcore-1.3.3/debian/copyright --- xvidcore-1.3.4/debian/copyright 2015-06-29 07:44:23.000000000 +0000 +++ xvidcore-1.3.3/debian/copyright 2016-09-23 00:49:18.000000000 +0000 @@ -1,101 +1,13 @@ -Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174&view=markup -Upstream-Name: xvidcore -Upstream-Contact: xvid-devel@xvid.org -Source: https://labs.xvid.com/source/ +This package was debianized by Christian Marillat on +Fri, 30 Nov 2001 16:42:45 +0100. -Files: * -Copyright: © 1999, Intel Corporation - © 2000-2001, Michel Lespinasse - © 2000, Royce Shih-Wea Liao - © 2000-2001, Peter Gubanov - © 2001, Fabrice Bellard - © 2001, Michael Niedermayer - © 2001-2003, xvid team - © 2001-2004, Peter Ross - © 2001-2011, Michael Militzer - © 2002, Alexander Viehl - © 2002, Benjamin Herrenschmidt - © 2002, Christian Engel - © 2002, Christian Schwarz - © 2002, Christopher Özbek - © 2002, Daniel Kallfass - © 2002, Daniel Smith - © 2002, Daniel Winkler - © 2002, Dirk Knop - © 2002, Dmitry Rozhdestvensky - © 2002, Haiko Gaisser - © 2002, Hannes Jütting - © 2002, Hans-Joachim Daniels - © 2002, Ingo-Marc Weber - © 2002, Johannes Singler - © 2002, Kai Kühn - © 2002, Max Stengel - © 2002, MinChen - © 2002, Sebastian Felis - © 2002, Sebastian Hack - © 2002, Stephan Krause - © 2002-2003, Christoph Lampert - © 2002-2003, Jaan Kalda - © 2002-2004, Benjamin Lambert - © 2002-2004, Edouard Gomez - © 2002-2005, Radoslaw Czyz - © 2002-2006, Pascal Massimino - © 2004, Dcoder - © 2004, Jean-Marc Bastide - © 2004, Marc Fauconneau - © 2004, Christoph Naegeli - © 2004-2005, Christoph Naegeli - © 2005, Carlo Bramini - © 2005-2006, Johannes Reinhardt - © 2006-2011, Xvid Solutions GmbH - © 2008, Jason Garrett-Glaser - © Johannes Singler -License: GPL-2+ +It was downloaded from http://www.videocoding.de/index.php?section=Download -Files: debian/* -Copyright: © 2001, Christian Marillat - © 2003, Edouard Gomez - © 2005-2009, Fabian Greffrath - © 2009, Loïc Martin - © 2009-2011, Reinhard Tartler , - © 2009-2011, Andres Mejia -License: GPL-2+ +Upstream Author: peter ross -Files: src/dct/ppc_asm/* -Copyright: © 2001, Michel Lespinasse - © 2004, Christoph Naegeli -License: LGPL-2+ +Copyright: (c)2001 peter ross -License: GPL-2+ - This package 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 package 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 . - . - On Debian systems, the complete text of the GNU General Public License - can be found at '/usr/share/common-licenses/GPL-2'. - -License: LGPL-2+ - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - . - This library 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 - Lesser 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 . - . - On Debian systems, the complete text of the GNU General Public License - can be found at '/usr/share/common-licenses/LGPL-2'. + You should have received a copy of the GNU General Public License with the + Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL; if + not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth + Floor, Boston, MA 02110-1301, USA. diff -Nru xvidcore-1.3.4/debian/gbp.conf xvidcore-1.3.3/debian/gbp.conf --- xvidcore-1.3.4/debian/gbp.conf 2015-06-29 07:17:59.000000000 +0000 +++ xvidcore-1.3.3/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -[DEFAULT] -debian-branch = master -pristine-tar = True diff -Nru xvidcore-1.3.4/debian/install xvidcore-1.3.3/debian/install --- xvidcore-1.3.4/debian/install 1970-01-01 00:00:00.000000000 +0000 +++ xvidcore-1.3.3/debian/install 2016-09-23 00:49:18.000000000 +0000 @@ -0,0 +1 @@ +usr/lib/*/libxvidcore.so.* diff -Nru xvidcore-1.3.4/debian/libxvidcore-dev.install xvidcore-1.3.3/debian/libxvidcore-dev.install --- xvidcore-1.3.4/debian/libxvidcore-dev.install 2015-06-29 07:17:59.000000000 +0000 +++ xvidcore-1.3.3/debian/libxvidcore-dev.install 2016-09-23 00:49:18.000000000 +0000 @@ -1,3 +1,3 @@ -usr/include -usr/lib/*/*.a -usr/lib/*/*.so +usr/include/xvid.h +usr/lib/*/libxvidcore.a +usr/lib/*/libxvidcore.so diff -Nru xvidcore-1.3.4/debian/libxvidcore4.install xvidcore-1.3.3/debian/libxvidcore4.install --- xvidcore-1.3.4/debian/libxvidcore4.install 2015-06-29 07:17:59.000000000 +0000 +++ xvidcore-1.3.3/debian/libxvidcore4.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -usr/lib/*/*.so.* diff -Nru xvidcore-1.3.4/debian/libxvidcore4.symbols xvidcore-1.3.3/debian/libxvidcore4.symbols --- xvidcore-1.3.4/debian/libxvidcore4.symbols 2015-06-29 07:17:59.000000000 +0000 +++ xvidcore-1.3.3/debian/libxvidcore4.symbols 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -libxvidcore.so.4 libxvidcore4 #MINVER# - xvid_decore@Base 1.2.2 - xvid_encore@Base 1.2.2 - xvid_global@Base 1.2.2 - xvid_plugin_2pass1@Base 1.2.2 - xvid_plugin_2pass2@Base 1.2.2 - xvid_plugin_dump@Base 1.2.2 - xvid_plugin_lumimasking@Base 1.2.2 - xvid_plugin_psnr@Base 1.2.2 - xvid_plugin_psnrhvsm@Base 2:1.3.0 - xvid_plugin_single@Base 1.2.2 - xvid_plugin_ssim@Base 1.2.2 diff -Nru xvidcore-1.3.4/debian/rules xvidcore-1.3.3/debian/rules --- xvidcore-1.3.4/debian/rules 2015-06-29 07:28:35.000000000 +0000 +++ xvidcore-1.3.3/debian/rules 2016-09-23 00:49:18.000000000 +0000 @@ -1,26 +1,42 @@ #!/usr/bin/make -f -export DEB_CFLAGS_MAINT_APPEND += $(shell dpkg-buildflags --get CPPFLAGS) +CFLAGS = $(shell dpkg-buildflags --get CFLAGS) +CFLAGS += $(shell dpkg-buildflags --get CPPFLAGS) -export DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) -export DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) +NCPUS := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1) -# Explicitely disable Altivec support on powerpc until we introduce flavours -ifeq ($(DEB_HOST_ARCH_CPU),powerpc) - confflags += --disable-assembly +ifeq ($(NCPUS),-1) + NCPUS:=1 endif -# Explicitely disable yasm support on kfreebsd, it's broken on 64bit; -# see: http://www.freebsd.org/cgi/cvsweb.cgi/ports/multimedia/xvid/Makefile?rev=1.36 -ifeq ($(DEB_HOST_ARCH_OS),kfreebsd) - confflags += --disable-assembly +ifeq ($(NCPUS),0) + NCPUS:=1 endif +CC := ccache $(CC) + %: - dh $@ --sourcedirectory=build/generic \ - --with autotools_dev \ - --parallel + dh $@ override_dh_auto_configure: - cd build/generic && autoconf - dh_auto_configure -- $(confflags) + cd build/generic && ./configure --prefix=/usr \ + --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \ + CC="$(CC)" + +override_dh_auto_build: + cd build/generic && $(MAKE) -j $(NCPUS) + +override_dh_install: + $(MAKE) -C build/generic install prefix=$(CURDIR)/debian/tmp/usr + + dh_install --fail-missing + +override_dh_builddeb: + dh_builddeb -- -Zxz + +override_dh_clean: + touch build/generic/platform.inc + cd build/generic && $(MAKE) distclean + + dh_clean diff -Nru xvidcore-1.3.4/debian/source/format xvidcore-1.3.3/debian/source/format --- xvidcore-1.3.4/debian/source/format 2015-06-29 07:17:59.000000000 +0000 +++ xvidcore-1.3.3/debian/source/format 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -3.0 (quilt) diff -Nru xvidcore-1.3.4/debian/watch xvidcore-1.3.3/debian/watch --- xvidcore-1.3.4/debian/watch 2015-06-29 07:19:20.000000000 +0000 +++ xvidcore-1.3.3/debian/watch 2016-09-23 00:49:18.000000000 +0000 @@ -1,3 +1,4 @@ version=3 -https://labs.xvid.com/source/ \ -http://downloads.xvid.org/downloads/xvidcore-([\d\.]*)\.tar\.gz + + +http://www.xvid.org/Downloads.43.0.html http://downloads.xvid.org/downloads/xvidcore-(.*)\.tar\.gz diff -Nru xvidcore-1.3.4/dshow/src/CXvidDecoder.cpp xvidcore-1.3.3/dshow/src/CXvidDecoder.cpp --- xvidcore-1.3.4/dshow/src/CXvidDecoder.cpp 2015-06-21 14:21:32.000000000 +0000 +++ xvidcore-1.3.3/dshow/src/CXvidDecoder.cpp 2014-04-08 20:41:05.000000000 +0000 @@ -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 2116 2015-06-15 13:00:46Z Isibaar $ + * $Id: CXvidDecoder.cpp 2059 2012-02-22 19:00:26Z Isibaar $ * ****************************************************************************/ @@ -178,8 +178,7 @@ extern HINSTANCE g_xvid_hInst; static int GUI_Page = 0; -static HWND MSG_hwnd = NULL; /* message handler window */ - +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) @@ -189,7 +188,6 @@ case WM_ICONMESSAGE: switch(lParam) { - case WM_LBUTTONUP: case WM_LBUTTONDBLCLK: if (!GUI_Page) { GUI_Page = 1; @@ -204,12 +202,14 @@ case WM_DESTROY: NOTIFYICONDATA nid; - ZeroMemory(&nid, sizeof(NOTIFYICONDATA)); + ZeroMemory(&nid,sizeof(NOTIFYICONDATA)); - nid.cbSize = sizeof(NOTIFYICONDATA); + nid.cbSize = NOTIFYICONDATA_V1_SIZE; nid.hWnd = hwnd; nid.uID = 1456; + Shell_NotifyIcon(NIM_DELETE, &nid); + Tray_Icon = 0; default: return DefWindowProc(hwnd, uMsg, wParam, lParam); } @@ -240,7 +240,7 @@ /* Register the MFT decoder */ MFTRegister(CLSID_XVID, // CLSID MFT_CATEGORY_VIDEO_DECODER, // Category - const_cast(XVID_NAME_MFT_L), // Friendly name + const_cast(XVID_NAME_L), // Friendly name 0, // Flags inputs_num, // Number of input types mft_bs, // Input types @@ -317,20 +317,15 @@ xvid_decore_func = NULL; // Hmm, some strange errors appearing if I try to initialize... xvid_global_func = NULL; // ...this in constructor's init-list. So, they assigned here. - m_tray_icon = 0; - m_startClock = clock(); - #if defined(XVID_USE_MFT) InitializeCriticalSection(&m_mft_lock); m_pInputType = NULL; m_pOutputType = NULL; - m_pOutputTypeBPP = 32; m_rtFrame = 0; m_duration = 0; m_discont = 0; m_frameRate.Denominator = 1; m_frameRate.Numerator = 1; - m_thread_handle = NULL; #endif LoadRegistryInfo(); @@ -345,8 +340,10 @@ #else if ((sLen >= 11) && (_strnicmp(&(lpFilename[sLen - 11]), TEXT("dllhost.exe"), 11) == 0)) { #endif - if (m_tray_icon == 0) m_tray_icon = -1; // create no tray icon upon thumbnail generation + if (Tray_Icon == 0) Tray_Icon = -1; // create no tray icon upon thumbnail generation } + else + if (Tray_Icon == -1) Tray_Icon = 0; // can show tray icon } } @@ -510,30 +507,20 @@ { DPRINTF("Destructor"); - if ((MSG_hwnd != NULL) && (m_tray_icon == 1)) { /* Destroy tray icon */ - SendMessage(MSG_hwnd, WM_CLOSE, 0, 0); - } - - /* Close xvidcore library */ - CloseLib(); + if (Tray_Icon > 0) { /* Destroy tray icon */ + NOTIFYICONDATA nid; + ZeroMemory(&nid,sizeof(NOTIFYICONDATA)); - clock_t endClock = clock(); - if (((endClock - m_startClock) / CLOCKS_PER_SEC) > 3) { - SaveRegistryInfo((endClock - m_startClock) / (CLOCKS_PER_SEC / 10)); + nid.cbSize = NOTIFYICONDATA_V1_SIZE; + nid.hWnd = MSG_hwnd; + nid.uID = 1456; + + Shell_NotifyIcon(NIM_DELETE, &nid); + Tray_Icon = 0; } - if ((MSG_hwnd != 0) && (m_tray_icon == 1)) { /* Final clean-up */ - MSG_hwnd = 0; - Sleep(200); - m_tray_icon = 0; -#if defined(XVID_USE_MFT) - if (m_thread_handle) { - TerminateThread(m_thread_handle, 0); - CloseHandle(m_thread_handle); - m_thread_handle = NULL; - } -#endif - } + /* Close xvidcore library */ + CloseLib(); #if defined(XVID_USE_MFT) DeleteCriticalSection(&m_mft_lock); @@ -835,18 +822,16 @@ /* (internal function) change colorspace */ -#define CALC_BI_STRIDE(width, bitcount) ((((width * bitcount) + 31) & ~31) >> 3) +#define CALC_BI_STRIDE(width,bitcount) ((((width * bitcount) + 31) & ~31) >> 3) -HRESULT CXvidDecoder::ChangeColorspace(GUID subtype, GUID formattype, void *format, int *bitdepth, int noflip) +HRESULT CXvidDecoder::ChangeColorspace(GUID subtype, GUID formattype, void * format, int noflip) { DWORD biWidth; - *bitdepth = 32; if (formattype == FORMAT_VideoInfo) { VIDEOINFOHEADER * vih = (VIDEOINFOHEADER * )format; biWidth = vih->bmiHeader.biWidth; - *bitdepth = vih->bmiHeader.biBitCount; out_stride = CALC_BI_STRIDE(vih->bmiHeader.biWidth, vih->bmiHeader.biBitCount); rgb_flip = (vih->bmiHeader.biHeight < 0 ? 0 : XVID_CSP_VFLIP); } @@ -854,7 +839,6 @@ { VIDEOINFOHEADER2 * vih2 = (VIDEOINFOHEADER2 * )format; biWidth = vih2->bmiHeader.biWidth; - *bitdepth = vih2->bmiHeader.biBitCount; out_stride = CALC_BI_STRIDE(vih2->bmiHeader.biWidth, vih2->bmiHeader.biBitCount); rgb_flip = (vih2->bmiHeader.biHeight < 0 ? 0 : XVID_CSP_VFLIP); } @@ -934,12 +918,11 @@ HRESULT CXvidDecoder::SetMediaType(PIN_DIRECTION direction, const CMediaType *pmt) { - int bitdepth; DPRINTF("SetMediaType"); if (direction == PINDIR_OUTPUT) { - return ChangeColorspace(*pmt->Subtype(), *pmt->FormatType(), pmt->Format(), &bitdepth, 0); + return ChangeColorspace(*pmt->Subtype(), *pmt->FormatType(), pmt->Format(), 0); } return S_OK; @@ -961,7 +944,7 @@ { DPRINTF("CompleteConnect"); - if ((direction == PINDIR_OUTPUT) && (MSG_hwnd == 0) && (m_tray_icon == 0) && (g_config.bTrayIcon != 0)) + if ((direction == PINDIR_OUTPUT) && (Tray_Icon == 0)&& (g_config.bTrayIcon != 0)) { WNDCLASSEX wc; @@ -986,20 +969,18 @@ NOTIFYICONDATA nid; ZeroMemory(&nid,sizeof(NOTIFYICONDATA)); - nid.cbSize = sizeof(NOTIFYICONDATA); + nid.cbSize = NOTIFYICONDATA_V1_SIZE; nid.hWnd = MSG_hwnd; nid.uID = 1456; - nid.uVersion = NOTIFYICON_VERSION; nid.uCallbackMessage = WM_ICONMESSAGE; nid.hIcon = LoadIcon(g_xvid_hInst, MAKEINTRESOURCE(IDI_ICON)); strcpy_s(nid.szTip, 19, "Xvid Video Decoder"); - nid.uFlags = NIF_MESSAGE | NIF_ICON | NIF_TIP | NIF_SHOWTIP; + nid.uFlags = NIF_MESSAGE | NIF_ICON | NIF_TIP; Shell_NotifyIcon(NIM_ADD, &nid); - Shell_NotifyIcon(NIM_SETVERSION, &nid); DestroyIcon(nid.hIcon); - m_tray_icon = 1; + Tray_Icon = 1; } return S_OK; @@ -1074,10 +1055,9 @@ pOut->GetMediaType(&mtOut); if (mtOut != NULL) { - int bitdepth; HRESULT result; - result = ChangeColorspace(mtOut->subtype, mtOut->formattype, mtOut->pbFormat, &bitdepth, 0); + result = ChangeColorspace(mtOut->subtype, mtOut->formattype, mtOut->pbFormat, 0); DeleteMediaType(mtOut); if (result != S_OK) @@ -1347,7 +1327,7 @@ pStreamInfo->cbAlignment = 0; } else { - pStreamInfo->cbSize = (m_create.width * abs(m_create.height) * m_pOutputTypeBPP) >> 3; + pStreamInfo->cbSize = m_create.width * abs(m_create.height) * 4; // XXX pStreamInfo->cbAlignment = 1; } @@ -1393,7 +1373,7 @@ return MF_E_INVALIDSTREAMNUMBER; DWORD i = 0; - GUID *bs_guid_table[32]; + GUID *bs_guid_table[8]; bs_guid_table[i++] = (GUID *)&CLSID_XVID; bs_guid_table[i++] = (GUID *)&CLSID_XVID_UC; @@ -1484,56 +1464,49 @@ bitdepth = 4; break; } - case 1: -if ( USE_YVYU ) -{ - csp = MFVideoFormat_YVYU; - bitdepth = 4; - break; -} - case 2 : + case 1 : if ( USE_UYVY ) { csp = MFVideoFormat_UYVY; bitdepth = 4; break; } - case 3 : + case 2 : if ( USE_IYUV ) { csp = MFVideoFormat_IYUV; bitdepth = 3; break; } - case 4 : + case 3 : if ( USE_YV12 ) { csp = MFVideoFormat_YV12; bitdepth = 3; break; } - case 5 : + case 4 : if ( USE_RGB32 ) { csp = MFVideoFormat_RGB32; bitdepth = 8; break; } - case 6 : + case 5 : if ( USE_RGB24 ) { csp = MFVideoFormat_RGB24; bitdepth = 6; break; } - case 7 : + case 6 : if ( USE_RG555 ) { csp = MFVideoFormat_RGB555; bitdepth = 4; break; } - case 8 : + case 7 : if ( USE_RG565 ) { csp = MFVideoFormat_RGB565; @@ -1571,11 +1544,11 @@ } if (SUCCEEDED(hr)) { - hr = pOutputType->SetUINT32(MF_MT_SAMPLE_SIZE, (abs(m_create.height) * m_create.width * bitdepth) >> 1); + hr = pOutputType->SetUINT32(MF_MT_SAMPLE_SIZE, (m_create.height * m_create.width * bitdepth)>>1); } if (SUCCEEDED(hr)) { - hr = MFSetAttributeSize(pOutputType, MF_MT_FRAME_SIZE, m_create.width, abs(m_create.height)); + hr = MFSetAttributeSize(pOutputType, MF_MT_FRAME_SIZE, m_create.width, m_create.height); } if (SUCCEEDED(hr)) { @@ -1623,7 +1596,7 @@ hr = MF_E_TRANSFORM_CANNOT_CHANGE_MEDIATYPE_WHILE_PROCESSING; if (SUCCEEDED(hr)) { - if (pType) { /* Check the type */ + if (pType) { // /* Check the type */ hr = OnCheckInputType(pType); } } @@ -1638,54 +1611,6 @@ return hr; } -DWORD WINAPI CreateTrayIcon(LPVOID lpParameter) -{ - WNDCLASSEX wc; - - wc.cbSize = sizeof(WNDCLASSEX); - wc.lpfnWndProc = msg_proc; - wc.style = CS_HREDRAW | CS_VREDRAW; - wc.cbWndExtra = 0; - wc.cbClsExtra = 0; - wc.hInstance = (HINSTANCE)g_xvid_hInst; - wc.hbrBackground = (HBRUSH)GetStockObject(NULL_BRUSH); - wc.lpszMenuName = NULL; - wc.lpszClassName = "XVID_MSG_WINDOW"; - wc.hIcon = NULL; - wc.hIconSm = NULL; - wc.hCursor = NULL; - RegisterClassEx(&wc); - - MSG_hwnd = CreateWindowEx(0, "XVID_MSG_WINDOW", NULL, 0, CW_USEDEFAULT, - CW_USEDEFAULT, 0, 0, HWND_MESSAGE, NULL, (HINSTANCE)g_xvid_hInst, NULL); - - /* display the tray icon */ - NOTIFYICONDATA nid; - ZeroMemory(&nid, sizeof(NOTIFYICONDATA)); - - nid.cbSize = sizeof(NOTIFYICONDATA); - nid.hWnd = MSG_hwnd; - nid.uID = 1456; - nid.uVersion = NOTIFYICON_VERSION; - nid.uCallbackMessage = WM_ICONMESSAGE; - nid.hIcon = LoadIcon(g_xvid_hInst, MAKEINTRESOURCE(IDI_ICON)); - strcpy_s(nid.szTip, 19, "Xvid Video Decoder"); - nid.uFlags = NIF_MESSAGE | NIF_ICON | NIF_TIP | NIF_SHOWTIP; - - Shell_NotifyIcon(NIM_ADD, &nid); - Shell_NotifyIcon(NIM_SETVERSION, &nid); - - DestroyIcon(nid.hIcon); - - MSG msg; - while (MSG_hwnd && GetMessage(&msg, MSG_hwnd, 0, 0)) { - TranslateMessage(&msg); - DispatchMessage(&msg); - } - - return 0; -} - HRESULT CXvidDecoder::MFTSetOutputType(DWORD dwOutputStreamID, IMFMediaType *pType, DWORD dwFlags) { DPRINTF("(MFT)SetOutputType"); @@ -1707,14 +1632,13 @@ if (HasPendingOutput()) hr = MF_E_TRANSFORM_CANNOT_CHANGE_MEDIATYPE_WHILE_PROCESSING; - int bitdepth; if (SUCCEEDED(hr)) { if (pType) { /* Check the type */ AM_MEDIA_TYPE *am; hr = MFCreateAMMediaTypeFromMFMediaType(pType, GUID_NULL, &am); if (SUCCEEDED(hr)) { - if (FAILED(ChangeColorspace(am->subtype, am->formattype, am->pbFormat, &bitdepth, 1))) { + if (FAILED(ChangeColorspace(am->subtype, am->formattype, am->pbFormat, 1))) { DPRINTF("(MFT)InternalCheckOutputType (MF_E_INVALIDTYPE)"); return MF_E_INVALIDTYPE; } @@ -1727,20 +1651,50 @@ if (SUCCEEDED(hr)) { if (bReallySet) { /* Set the type if needed */ - hr = OnSetOutputType(pType, bitdepth); + hr = OnSetOutputType(pType); } } - if (SUCCEEDED(hr) && (MSG_hwnd == 0) && (m_tray_icon == 0) && (g_config.bTrayIcon != 0)) + if (SUCCEEDED(hr) && (Tray_Icon == 0) && (g_config.bTrayIcon != 0)) /* Create message passing window */ { - m_thread_handle = CreateThread(NULL, 0, CreateTrayIcon, NULL, 0, NULL); /* Create message passing window */ + WNDCLASSEX wc; + + wc.cbSize = sizeof(WNDCLASSEX); + wc.lpfnWndProc = msg_proc; + wc.style = CS_HREDRAW | CS_VREDRAW; + wc.cbWndExtra = 0; + wc.cbClsExtra = 0; + wc.hInstance = (HINSTANCE) g_xvid_hInst; + wc.hbrBackground = (HBRUSH) GetStockObject(NULL_BRUSH); + wc.lpszMenuName = NULL; + wc.lpszClassName = "XVID_MSG_WINDOW"; + wc.hIcon = NULL; + wc.hIconSm = NULL; + wc.hCursor = NULL; + RegisterClassEx(&wc); + + MSG_hwnd = CreateWindowEx(0, "XVID_MSG_WINDOW", NULL, 0, CW_USEDEFAULT, + CW_USEDEFAULT, 0, 0, HWND_MESSAGE, NULL, (HINSTANCE) g_xvid_hInst, NULL); + + /* display the tray icon */ + NOTIFYICONDATA nid; + ZeroMemory(&nid,sizeof(NOTIFYICONDATA)); + + nid.cbSize = NOTIFYICONDATA_V1_SIZE; + nid.hWnd = MSG_hwnd; + nid.uID = 1456; + nid.uCallbackMessage = WM_ICONMESSAGE; + nid.hIcon = LoadIcon(g_xvid_hInst, MAKEINTRESOURCE(IDI_ICON)); + strcpy_s(nid.szTip, 19, "Xvid Video Decoder"); + nid.uFlags = NIF_MESSAGE | NIF_ICON | NIF_TIP; + + Shell_NotifyIcon(NIM_ADD, &nid); - if (m_thread_handle) - m_tray_icon = 1; + DestroyIcon(nid.hIcon); + Tray_Icon = 1; } LeaveCriticalSection(&m_mft_lock); - return hr; } @@ -1808,7 +1762,7 @@ EnterCriticalSection(&m_mft_lock); - /* If there's pending output samples we don't accept new + /* If there's pending output sampels we don't accept new input data until ProcessOutput() or Flush() was called */ if (!HasPendingOutput()) { *pdwFlags = MFT_INPUT_STATUS_ACCEPT_DATA; @@ -2045,8 +1999,7 @@ } ar_x = par_x * stats.data.vol.width; - ar_y = par_y * stats.data.vol.height; /* TODO: Actually set the newly determined AR on the output sample type - or it'll have no effect at all... */ + ar_y = par_y * stats.data.vol.height; } m_frame.bitstream = (BYTE*)m_frame.bitstream + length; @@ -2108,28 +2061,19 @@ BYTE *Dst = NULL; DWORD buffer_size; - LONG stride = m_create.width; + IMFMediaBuffer *pOutput = NULL; - IMF2DBuffer *pOutput2D = NULL; - + if (SUCCEEDED(hr)) { hr = pOutputSamples[0].pSample->GetBufferByIndex(0, &pOutput); /* Get output buffer */ } - + if (SUCCEEDED(hr)) { hr = pOutput->GetMaxLength(&buffer_size); } - - if (SUCCEEDED(hr)) { - hr = pOutput->QueryInterface(IID_IMF2DBuffer, (void **)&pOutput2D); - } - - if (SUCCEEDED(hr)) { - hr = pOutput2D->Lock2D(&Dst, &stride); - } - else { + + if (SUCCEEDED(hr)) hr = pOutput->Lock(&Dst, NULL, NULL); - } if (SUCCEEDED(hr)) { xvid_gbl_convert_t convert; @@ -2147,7 +2091,7 @@ convert.output.csp = m_frame.output.csp; convert.output.plane[0] = Dst; - convert.output.stride[0] = stride; + convert.output.stride[0] = out_stride; convert.width = m_create.width; convert.height = m_create.height; @@ -2156,6 +2100,7 @@ if (m_frame.output.plane[1] != NULL && Dst != NULL && xvid_global_func != NULL) if (xvid_global_func(0, XVID_GBL_CONVERT, &convert, NULL) < 0) /* CSP convert into output buffer */ hr = E_FAIL; + m_frame.output.plane[1] = NULL; } @@ -2180,20 +2125,14 @@ } if (SUCCEEDED(hr)) - hr = pOutput->SetCurrentLength((m_create.width * abs(m_create.height) * m_pOutputTypeBPP) >> 3); + hr = pOutput->SetCurrentLength(m_create.width * abs(m_create.height) * 4); // XXX } - if (pOutput2D) { - pOutput2D->Unlock2D(); - pOutput2D->Release(); - if (pOutput) - pOutput->Release(); - } - else if (pOutput) { - pOutput->Unlock(); - pOutput->Release(); + if (pOutput) { + pOutput->Unlock(); + pOutput->Release(); } - + LeaveCriticalSection(&m_mft_lock); return hr; @@ -2307,7 +2246,7 @@ CloseLib(); hr = MF_E_INVALIDTYPE; } - + /* haali media splitter reports VOL information in the format header */ if (SUCCEEDED(hr)) { @@ -2377,14 +2316,13 @@ return hr; } -HRESULT CXvidDecoder::OnSetOutputType(IMFMediaType *pmt, int bitdepth) +HRESULT CXvidDecoder::OnSetOutputType(IMFMediaType *pmt) { if (m_pOutputType) m_pOutputType->Release(); m_pOutputType = pmt; m_pOutputType->AddRef(); - m_pOutputTypeBPP = bitdepth; - + return S_OK; } diff -Nru xvidcore-1.3.4/dshow/src/CXvidDecoder.h xvidcore-1.3.3/dshow/src/CXvidDecoder.h --- xvidcore-1.3.4/dshow/src/CXvidDecoder.h 2015-06-21 14:21:32.000000000 +0000 +++ xvidcore-1.3.3/dshow/src/CXvidDecoder.h 2014-04-08 20:41:05.000000000 +0000 @@ -19,19 +19,17 @@ * 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.h 2114 2015-06-14 19:18:14Z Isibaar $ + * $Id: CXvidDecoder.h 2059 2012-02-22 19:00:26Z Isibaar $ * ****************************************************************************/ #ifndef _FILTER_H_ #define _FILTER_H_ -#include #include #include "IXvidDecoder.h" #define XVID_NAME_L L"Xvid MPEG-4 Video Decoder" -#define XVID_NAME_MFT_L L"Xvid MPEG-4 Video Decoder MFT" /* --- fourcc --- */ @@ -155,7 +153,7 @@ private : - HRESULT ChangeColorspace(GUID subtype, GUID formattype, void * format, int *bitdepth, int noflip); + HRESULT ChangeColorspace(GUID subtype, GUID formattype, void * format, int noflip); HRESULT OpenLib(); void CloseLib(); @@ -171,9 +169,6 @@ int rgb_flip; int out_stride; - clock_t m_startClock; - int m_tray_icon; - /* mft stuff */ #if defined(XVID_USE_MFT) BOOL HasPendingOutput() const { return m_frame.output.plane[1] != NULL; } @@ -181,11 +176,10 @@ HRESULT OnSetInputType(IMFMediaType *pmt); HRESULT OnCheckInputType(IMFMediaType *pmt); - HRESULT OnSetOutputType(IMFMediaType *pmt, int bitdepth); + HRESULT OnSetOutputType(IMFMediaType *pmt); IMFMediaType *m_pInputType; IMFMediaType *m_pOutputType; - int m_pOutputTypeBPP; CRITICAL_SECTION m_mft_lock; REFERENCE_TIME m_timestamp; @@ -197,9 +191,9 @@ REFERENCE_TIME m_rtFrame; MFRatio m_frameRate; UINT64 m_duration; - - HANDLE m_thread_handle; #endif + + HWND MSG_hwnd; /* message handler window */ }; #define WM_ICONMESSAGE (WM_USER + 1) diff -Nru xvidcore-1.3.4/dshow/src/config.c xvidcore-1.3.3/dshow/src/config.c --- xvidcore-1.3.4/dshow/src/config.c 2015-06-21 14:21:32.000000000 +0000 +++ xvidcore-1.3.3/dshow/src/config.c 2014-04-08 20:41:05.000000000 +0000 @@ -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: config.c 2114 2015-06-14 19:18:14Z Isibaar $ + * $Id: config.c 2059 2012-02-22 19:00:26Z Isibaar $ * ****************************************************************************/ @@ -62,7 +62,7 @@ RegCloseKey(hKey); } -void SaveRegistryInfo(int perfCount) +void SaveRegistryInfo() { HKEY hKey; DWORD dispo; @@ -82,33 +82,19 @@ return; } - if (perfCount > 0) { - unsigned int updateCount = 0; - HKEY hKey2 = hKey; - DWORD size; - - RegOpenKeyEx(XVID_REG_KEY, XVID_REG_SUBKEY, 0, KEY_READ, &hKey); - REG_GET_N("PerfCount", updateCount, 0); - RegCloseKey(hKey); - hKey = hKey2; - updateCount += perfCount; - REG_SET_N("PerfCount", updateCount); - } - else { - 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); - REG_SET_N("Tray_Icon", g_config.bTrayIcon); - } + 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); + REG_SET_N("Tray_Icon", g_config.bTrayIcon); RegCloseKey(hKey); } @@ -139,7 +125,7 @@ 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(0); + SaveRegistryInfo(); } break; @@ -288,14 +274,14 @@ EnableWindow(GetDlgItem(hwnd, IDC_USE_AR), !g_config.videoinfo_compat); - SaveRegistryInfo(0); + SaveRegistryInfo(); break; case WM_NOTIFY: hBrightness = GetDlgItem(hwnd, IDC_BRIGHTNESS); g_config.nBrightness = (int) SendMessage(hBrightness, TBM_GETPOS, (WPARAM)NULL, (LPARAM)NULL); - SaveRegistryInfo(0); + SaveRegistryInfo(); break; default : return FALSE; diff -Nru xvidcore-1.3.4/dshow/src/config.h xvidcore-1.3.3/dshow/src/config.h --- xvidcore-1.3.4/dshow/src/config.h 2015-06-21 14:21:32.000000000 +0000 +++ xvidcore-1.3.3/dshow/src/config.h 2014-04-08 20:41:05.000000000 +0000 @@ -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: config.h 2114 2015-06-14 19:18:14Z Isibaar $ + * $Id: config.h 2059 2012-02-22 19:00:26Z Isibaar $ * ****************************************************************************/ @@ -77,7 +77,7 @@ /* functions */ void LoadRegistryInfo(); -void SaveRegistryInfo(int perfCount); +void SaveRegistryInfo(); INT_PTR CALLBACK adv_proc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); #define XVID_DLL_NAME "xvidcore.dll" Binary files /tmp/derivs-cmp-srcpkg-Parsix-Pakjw7/Awf9jD8v5A/xvidcore-1.3.4/dshow/src/xvid.ico and /tmp/derivs-cmp-srcpkg-Parsix-Pakjw7/wBOFSwGHFs/xvidcore-1.3.3/dshow/src/xvid.ico differ diff -Nru xvidcore-1.3.4/src/encoder.c xvidcore-1.3.3/src/encoder.c --- xvidcore-1.3.4/src/encoder.c 2015-06-21 14:21:32.000000000 +0000 +++ xvidcore-1.3.3/src/encoder.c 2014-04-08 20:41:04.000000000 +0000 @@ -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 2099 2014-11-25 23:17:01Z Isibaar $ + * $Id: encoder.c 1985 2011-05-18 09:02:35Z Isibaar $ * ****************************************************************************/ @@ -452,7 +452,7 @@ #ifndef HAVE_PTHREAD int t = MAX(1, create->num_threads); #else - int t = MAX(1, MIN(create->num_threads, (int) (pEnc->mbParam.mb_height>>1))); /* at least two rows per thread */ + int t = MIN(create->num_threads, (int) (pEnc->mbParam.mb_height>>1)); /* at least two rows per thread */ #endif int threads_per_slice = MAX(1, (t / pEnc->num_slices)); int rows_per_thread = (pEnc->mbParam.mb_height + threads_per_slice - 1) / threads_per_slice; diff -Nru xvidcore-1.3.4/src/image/x86_asm/colorspace_rgb_mmx.asm xvidcore-1.3.3/src/image/x86_asm/colorspace_rgb_mmx.asm --- xvidcore-1.3.4/src/image/x86_asm/colorspace_rgb_mmx.asm 2015-06-21 14:21:32.000000000 +0000 +++ xvidcore-1.3.3/src/image/x86_asm/colorspace_rgb_mmx.asm 2014-04-08 20:41:04.000000000 +0000 @@ -119,8 +119,8 @@ pxor mm4, mm4 pxor mm5, mm5 - movd mm0, [x_ptr] ; x_ptr[0...] - movd mm2, [x_ptr+x_stride] ; x_ptr[x_stride...] + movd mm0, [x_ptr] ; x_ptr[0...] + movd mm2, [x_ptr+x_stride] ; x_ptr[x_stride...] punpcklbw mm0, mm4 ; [ |b |g |r ] punpcklbw mm2, mm5 ; [ |b |g |r ] movq mm6, mm0 ; = [ |b4|g4|r4] @@ -136,15 +136,8 @@ pxor mm4, mm4 pxor mm5, mm5 -%if %1 == 3 ; BGR (24-bit) - movd mm1, [x_ptr+2] - movd mm3, [x_ptr+x_stride+2] - psrlq mm1, 8 ; src[%1...] - psrlq mm3, 8 ; src[x_stride+%1...] -%else - movd mm1, [x_ptr+%1] ; src[%1...] - movd mm3, [x_ptr+x_stride+%1] ; src[x_stride+%1...] -%endif + movd mm1, [x_ptr+%1] ; src[%1...] + movd mm3, [x_ptr+x_stride+%1] ; src[x_stride+%1...] punpcklbw mm1, mm4 ; [ |b |g |r ] punpcklbw mm3, mm5 ; [ |b |g |r ] paddw mm6, mm1 ; +[ |b4|g4|r4] @@ -244,15 +237,8 @@ pxor mm4, mm4 pxor mm5, mm5 -%if %1 == 3 ; BGR (24-bit) - movd mm1, [x_ptr+2] - movd mm3, [x_ptr+x_stride+2] - psrlq mm1, 8 ; src[%1...] - psrlq mm3, 8 ; src[x_stride+%1...] -%else movd mm1, [x_ptr+%1] ; src[%1...] movd mm3, [x_ptr+x_stride+%1] ; src[x_stride+%1...] -%endif punpcklbw mm1, mm4 ; [ |b |g |r ] punpcklbw mm3, mm5 ; [ |b |g |r ] paddw mm6, mm1 ; +[ |b4|g4|r4] diff -Nru xvidcore-1.3.4/src/xvid.c xvidcore-1.3.3/src/xvid.c --- xvidcore-1.3.4/src/xvid.c 2015-06-21 14:21:32.000000000 +0000 +++ xvidcore-1.3.3/src/xvid.c 2014-04-08 20:41:04.000000000 +0000 @@ -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 2123 2015-06-17 19:49:29Z Isibaar $ + * $Id: xvid.c 2082 2014-04-08 20:19:42Z Isibaar $ * ****************************************************************************/ @@ -699,7 +699,7 @@ return XVID_ERR_VERSION; info->actual_version = XVID_VERSION; - info->build = "xvid-1.3.4"; + info->build = "xvid-1.3.3"; info->cpu_flags = detect_cpu_flags(); info->num_threads = 0; /* single-thread */ diff -Nru xvidcore-1.3.4/src/xvid.h xvidcore-1.3.3/src/xvid.h --- xvidcore-1.3.4/src/xvid.h 2015-06-21 14:21:32.000000000 +0000 +++ xvidcore-1.3.3/src/xvid.h 2014-04-08 20:41:04.000000000 +0000 @@ -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 2123 2015-06-17 19:49:29Z 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,4) +#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 67 +#define XVID_BS_VERSION 65 /***************************************************************************** * error codes