-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi
Attached the patch for the version I intend to upload. Please respond if
you don't want this NMU to happen, if you are working yourself on a
patch or if you think that the attached patch won't work.
Cheers
Luk
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (GNU/Linux)
iD8DBQFDVXV35UTeB5t8Mo0RAuq+AJ9j/Zkmxhd0v07S/ZdZHv/TKyIH/ACeN3Hi
n2ovsRfsR0OigQfper9cppU=
=q5vW
-----END PGP SIGNATURE-----
diff -Nru /tmp/9NXb7ZiJab/avifile-0.7.43.20050224/acinclude.m4
/tmp/ZUeXaisFMJ/avifile-0.7.43.20050224/acinclude.m4
--- /tmp/9NXb7ZiJab/avifile-0.7.43.20050224/acinclude.m4 2005-02-24
14:25:09.000000000 +0100
+++ /tmp/ZUeXaisFMJ/avifile-0.7.43.20050224/acinclude.m4 2005-10-18
19:12:54.000000000 +0200
@@ -993,6 +993,28 @@
rm -f conftest.c conftest
])
+# Configure paths for video4linux
+
+dnl Usage:
+dnl AC_CHECK_V4L([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
+dnl Test for video4linux interface, and defines
+dnl prerequisites:
+
+AC_DEFUN([AC_CHECK_V4L],
+[
+ AC_ARG_ENABLE(v4l, [ --enable-v4l support v4l video interface.
(autodetect)],
+ [], enable_v4l=yes)
+ if test x$enable_v4l = xyes; then
+ AC_CHECK_HEADER([linux/videodev.h], [], [ enable_v4l=no; ])
+ fi
+
+ if test x$enable_v4l = xyes; then
+ ifelse([$1], , :, [$1])
+ else
+ ifelse([$2], , :, [$2])
+ fi
+])
+
dnl -*- shell-script -*-
dnl This file is part of the Avifile packages
@@ -1736,76 +1758,54 @@
rm -f conf.vorbistest
])
-# Configure paths for video4linux
-
-dnl Usage:
-dnl AC_CHECK_V4L([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-dnl Test for video4linux interface, and defines
-dnl prerequisites:
-
-AC_DEFUN([AC_CHECK_V4L],
-[
- AC_ARG_ENABLE(v4l, [ --enable-v4l support v4l video interface.
(autodetect)],
- [], enable_v4l=yes)
- if test x$enable_v4l = xyes; then
- AC_CHECK_HEADER([linux/videodev.h], [], [ enable_v4l=no; ])
- fi
-
- if test x$enable_v4l = xyes; then
- ifelse([$1], , :, [$1])
- else
- ifelse([$2], , :, [$2])
- fi
-])
-
-# Configure paths for libxvidcore
+# Configure paths for libxvidcore version 1.0
dnl AM_PATH_XVID([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-dnl Test for libxvidcore, and define XVID_CFLAGS and XVID_LIBS
+dnl Test for libxvidcore, and define XVID4_CFLAGS and XVID4_LIBS
dnl
-AC_DEFUN([AM_PATH_XVID],
+AC_DEFUN([AM_PATH_XVID4],
[
- AC_ARG_WITH(xvid_prefix, [ --with-xvid-prefix=PFX where XviD is
installed. (optional)],
- [], with_xvid_prefix="")
+ AC_ARG_WITH(xvid4_prefix, [ --with-xvid4-prefix=PFX where XviD4 is
installed. (optional)],
+ [], with_xvid4_prefix="")
- AC_ARG_ENABLE(xvidtest, [ --disable-xvidtest do not try to compile
and run a test XviD program],
- [], enable_xvidtest=yes)
+ AC_ARG_ENABLE(xvid4test, [ --disable-xvid4test do not try to compile
and run a test XviD4 program],
+ [], enable_xvid4test=yes)
- XVID_CFLAGS=""
- XVID_LIBS=""
+ XVID4_CFLAGS=""
+ XVID4_LIBS=""
- have_xvid=no
+ have_xvid4=no
ac_save_CPPFLAGS=$CPPFLAGS
- if test -n "$with_xvid_prefix" ; then
+ if test -n "$with_xvid4_prefix" ; then
dnl user has specified extra path for XviD instalation
- CPPFLAGS="-I$with_xvid_prefix $CPPFLAGS"
+ CPPFLAGS="-I$with_xvid4_prefix $CPPFLAGS"
AC_CHECK_HEADER(include/xvid.h,
- XVID_CFLAGS="-I$with_xvid_prefix/include"
- XVID_LIBS="-L$with_xvid_prefix/lib"
- have_xvid=yes)
- if test x$have_xvid = xno ; then
+ XVID4_CFLAGS="-I$with_xvid4_prefix/include"
+ XVID4_LIBS="-L$with_xvid4_prefix/lib"
+ have_xvid4=yes)
+ if test x$have_xvid4 = xno ; then
AC_CHECK_HEADER(xvid.h,
- XVID_CFLAGS="-I$with_xvid_prefix"
- XVID_LIBS="-L$with_xvid_prefix"
- have_xvid=yes)
+ XVID4_CFLAGS="-I$with_xvid4_prefix"
+ XVID4_LIBS="-L$with_xvid4_prefix"
+ have_xvid4=yes)
fi
else
- AC_CHECK_HEADER(xvid.h, have_xvid=yes)
+ AC_CHECK_HEADER(xvid.h, have_xvid4=yes)
fi
CPPFLAGS=$ac_save_CPPFLAGS
- XVID_LIBS="$XVID_LIBS -lxvidcore"
+ XVID4_LIBS="$XVID4_LIBS -lxvidcore"
dnl
dnl Now check if the installed XviD is sufficiently new.
dnl
- if test x$have_xvid = xyes -a x$enable_xvidtest = xyes ; then
- AC_CACHE_CHECK([for xvid_init in -lxvidcore],
- ac_cv_val_HAVE_XVID,
+ if test x$have_xvid4 = xyes -a x$enable_xvid4test = xyes ; then
+ AC_CACHE_CHECK([for xvid_global in -lxvidcore (4)],
+ ac_cv_val_HAVE_XVID4,
[ rm -f conf.xvidtest
ac_save_CFLAGS=$CFLAGS
ac_save_LIBS=$LIBS
- CFLAGS="$CFLAGS $XVID_CFLAGS"
- LIBS="$LIBS $XVID_LIBS"
+ CFLAGS="$CFLAGS $XVID4_CFLAGS"
+ LIBS="$LIBS $XVID4_LIBS"
AC_TRY_RUN([
#include <stdio.h>
#include <stdlib.h>
@@ -1814,38 +1814,37 @@
int main ()
{
- XVID_INIT_PARAM xinit;
+ xvid_gbl_info_t xinfo;
system("touch conf.xvidtest");
- xinit.cpu_flags = 0;
- xvid_init(NULL, 0, &xinit, NULL);
+ memset(&xinfo, 0, sizeof(xinfo));
+ xinfo.version = XVID_VERSION;
- if (xinit.api_version == API_VERSION) {
- return 0;
- } else {
+ if (xvid_global(NULL, XVID_GBL_INIT, &xinfo, NULL) == XVID_ERR_FAIL) {
printf("Header file and library are out of sync. Header file supports\n"
"version %d.%d API and shared library supports version %d.%d API.\n",
- API_VERSION >> 16, API_VERSION & 0xFFFF,
- xinit.api_version >> 16, xinit.api_version & 0xFFFF);
+ XVID_VERSION >> 16, XVID_VERSION & 0xFFFF,
+ xinfo.version >> 16, xinfo.version & 0xFFFF);
return 1;
- }
-}
+ } else
+ return 0;
+}
],
- [ ac_cv_val_HAVE_XVID=yes ],
- [ ac_cv_val_HAVE_XVID=no ],
+ [ ac_cv_val_HAVE_XVID4=yes ],
+ [ ac_cv_val_HAVE_XVID4=no ],
[ echo $ac_n "cross compiling; assumed OK... $ac_c" ])
CFLAGS=$ac_save_CFLAGS
LIBS=$ac_save_LIBS])
- test x$ac_cv_val_HAVE_XVID = xno && have_xvid=no
+ test x$ac_cv_val_HAVE_XVID4 = xno && have_xvid4=no
fi
- if test x$have_xvid = xyes ; then
+ if test x$have_xvid4 = xyes ; then
ifelse([$1], , :, [$1])
else
if test ! -f conf.xvidtest ; then
- AC_MSG_WARN([Could not run XviD test program, checking why...])
- CFLAGS="$CFLAGS $XVID_CFLAGS"
- LIBS="$LIBS $XVID_LIBS"
+ AC_MSG_WARN([Could not run XviD4 test program, checking why...])
+ CFLAGS="$CFLAGS $XVID4_CFLAGS"
+ LIBS="$LIBS $XVID4_LIBS"
AC_TRY_LINK([
#include <stdio.h>
#include <xvid.h>
@@ -1864,63 +1863,63 @@
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
fi
- XVID_CFLAGS=""
- XVID_LIBS=""
+ XVID4_CFLAGS=""
+ XVID4_LIBS=""
ifelse([$2], , :, [$2])
fi
- AC_SUBST(XVID_CFLAGS)
- AC_SUBST(XVID_LIBS)
+ AC_SUBST(XVID4_CFLAGS)
+ AC_SUBST(XVID4_LIBS)
rm -f conf.xvidtest
])
-# Configure paths for libxvidcore version 1.0
+# Configure paths for libxvidcore
dnl AM_PATH_XVID([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-dnl Test for libxvidcore, and define XVID4_CFLAGS and XVID4_LIBS
+dnl Test for libxvidcore, and define XVID_CFLAGS and XVID_LIBS
dnl
-AC_DEFUN([AM_PATH_XVID4],
+AC_DEFUN([AM_PATH_XVID],
[
- AC_ARG_WITH(xvid4_prefix, [ --with-xvid4-prefix=PFX where XviD4 is
installed. (optional)],
- [], with_xvid4_prefix="")
+ AC_ARG_WITH(xvid_prefix, [ --with-xvid-prefix=PFX where XviD is
installed. (optional)],
+ [], with_xvid_prefix="")
- AC_ARG_ENABLE(xvid4test, [ --disable-xvid4test do not try to compile
and run a test XviD4 program],
- [], enable_xvid4test=yes)
+ AC_ARG_ENABLE(xvidtest, [ --disable-xvidtest do not try to compile
and run a test XviD program],
+ [], enable_xvidtest=yes)
- XVID4_CFLAGS=""
- XVID4_LIBS=""
+ XVID_CFLAGS=""
+ XVID_LIBS=""
- have_xvid4=no
+ have_xvid=no
ac_save_CPPFLAGS=$CPPFLAGS
- if test -n "$with_xvid4_prefix" ; then
+ if test -n "$with_xvid_prefix" ; then
dnl user has specified extra path for XviD instalation
- CPPFLAGS="-I$with_xvid4_prefix $CPPFLAGS"
+ CPPFLAGS="-I$with_xvid_prefix $CPPFLAGS"
AC_CHECK_HEADER(include/xvid.h,
- XVID4_CFLAGS="-I$with_xvid4_prefix/include"
- XVID4_LIBS="-L$with_xvid4_prefix/lib"
- have_xvid4=yes)
- if test x$have_xvid4 = xno ; then
+ XVID_CFLAGS="-I$with_xvid_prefix/include"
+ XVID_LIBS="-L$with_xvid_prefix/lib"
+ have_xvid=yes)
+ if test x$have_xvid = xno ; then
AC_CHECK_HEADER(xvid.h,
- XVID4_CFLAGS="-I$with_xvid4_prefix"
- XVID4_LIBS="-L$with_xvid4_prefix"
- have_xvid4=yes)
+ XVID_CFLAGS="-I$with_xvid_prefix"
+ XVID_LIBS="-L$with_xvid_prefix"
+ have_xvid=yes)
fi
else
- AC_CHECK_HEADER(xvid.h, have_xvid4=yes)
+ AC_CHECK_HEADER(xvid.h, have_xvid=yes)
fi
CPPFLAGS=$ac_save_CPPFLAGS
- XVID4_LIBS="$XVID4_LIBS -lxvidcore"
+ XVID_LIBS="$XVID_LIBS -lxvidcore"
dnl
dnl Now check if the installed XviD is sufficiently new.
dnl
- if test x$have_xvid4 = xyes -a x$enable_xvid4test = xyes ; then
- AC_CACHE_CHECK([for xvid_global in -lxvidcore (4)],
- ac_cv_val_HAVE_XVID4,
+ if test x$have_xvid = xyes -a x$enable_xvidtest = xyes ; then
+ AC_CACHE_CHECK([for xvid_init in -lxvidcore],
+ ac_cv_val_HAVE_XVID,
[ rm -f conf.xvidtest
ac_save_CFLAGS=$CFLAGS
ac_save_LIBS=$LIBS
- CFLAGS="$CFLAGS $XVID4_CFLAGS"
- LIBS="$LIBS $XVID4_LIBS"
+ CFLAGS="$CFLAGS $XVID_CFLAGS"
+ LIBS="$LIBS $XVID_LIBS"
AC_TRY_RUN([
#include <stdio.h>
#include <stdlib.h>
@@ -1929,37 +1928,38 @@
int main ()
{
- xvid_gbl_info_t xinfo;
+ XVID_INIT_PARAM xinit;
system("touch conf.xvidtest");
- memset(&xinfo, 0, sizeof(xinfo));
- xinfo.version = XVID_VERSION;
+ xinit.cpu_flags = 0;
+ xvid_init(NULL, 0, &xinit, NULL);
- if (xvid_global(NULL, XVID_GBL_INIT, &xinfo, NULL) == XVID_ERR_FAIL) {
+ if (xinit.api_version == API_VERSION) {
+ return 0;
+ } else {
printf("Header file and library are out of sync. Header file supports\n"
"version %d.%d API and shared library supports version %d.%d API.\n",
- XVID_VERSION >> 16, XVID_VERSION & 0xFFFF,
- xinfo.version >> 16, xinfo.version & 0xFFFF);
+ API_VERSION >> 16, API_VERSION & 0xFFFF,
+ xinit.api_version >> 16, xinit.api_version & 0xFFFF);
return 1;
- } else
- return 0;
-}
+ }
+}
],
- [ ac_cv_val_HAVE_XVID4=yes ],
- [ ac_cv_val_HAVE_XVID4=no ],
+ [ ac_cv_val_HAVE_XVID=yes ],
+ [ ac_cv_val_HAVE_XVID=no ],
[ echo $ac_n "cross compiling; assumed OK... $ac_c" ])
CFLAGS=$ac_save_CFLAGS
LIBS=$ac_save_LIBS])
- test x$ac_cv_val_HAVE_XVID4 = xno && have_xvid4=no
+ test x$ac_cv_val_HAVE_XVID = xno && have_xvid=no
fi
- if test x$have_xvid4 = xyes ; then
+ if test x$have_xvid = xyes ; then
ifelse([$1], , :, [$1])
else
if test ! -f conf.xvidtest ; then
- AC_MSG_WARN([Could not run XviD4 test program, checking why...])
- CFLAGS="$CFLAGS $XVID4_CFLAGS"
- LIBS="$LIBS $XVID4_LIBS"
+ AC_MSG_WARN([Could not run XviD test program, checking why...])
+ CFLAGS="$CFLAGS $XVID_CFLAGS"
+ LIBS="$LIBS $XVID_LIBS"
AC_TRY_LINK([
#include <stdio.h>
#include <xvid.h>
@@ -1978,12 +1978,12 @@
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
fi
- XVID4_CFLAGS=""
- XVID4_LIBS=""
+ XVID_CFLAGS=""
+ XVID_LIBS=""
ifelse([$2], , :, [$2])
fi
- AC_SUBST(XVID4_CFLAGS)
- AC_SUBST(XVID4_LIBS)
+ AC_SUBST(XVID_CFLAGS)
+ AC_SUBST(XVID_LIBS)
rm -f conf.xvidtest
])
diff -Nru /tmp/9NXb7ZiJab/avifile-0.7.43.20050224/configure.in
/tmp/ZUeXaisFMJ/avifile-0.7.43.20050224/configure.in
--- /tmp/9NXb7ZiJab/avifile-0.7.43.20050224/configure.in 2005-02-24
12:31:38.000000000 +0100
+++ /tmp/ZUeXaisFMJ/avifile-0.7.43.20050224/configure.in 2005-10-18
18:46:40.000000000 +0200
@@ -116,6 +116,8 @@
AC_DEFINE(ARCH_POWERPC, 1, [Define if you want to build on ppc
architecture.])
enable_ppcopt=yes
;;
+ s390*)
+ AC_DEFINE(ARCH_S390, 1, [Define if you want to build on s390
architecture.])
esac
diff -Nru /tmp/9NXb7ZiJab/avifile-0.7.43.20050224/debian/changelog
/tmp/ZUeXaisFMJ/avifile-0.7.43.20050224/debian/changelog
--- /tmp/9NXb7ZiJab/avifile-0.7.43.20050224/debian/changelog 2005-02-24
13:25:02.000000000 +0100
+++ /tmp/ZUeXaisFMJ/avifile-0.7.43.20050224/debian/changelog 2005-10-18
18:48:57.000000000 +0200
@@ -1,3 +1,17 @@
+avifile (1:0.7.43.20050224-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Rebuilt for Qt/KDE transition
+ (Closes: #321550, #324848, #220056, #318233, #320883, #325435).
+ * C++ ABI transition (Closes: #327932, #330012).
+ * Omit 'no-omit-leaf-frame-pointer' option (Closes: #206467).
+ * Fix gcc-4.0 compilation (Closes: #300179).
+ * Fix some copyright statements (Closes: #324970).
+ * Add s390 to supported platforms (Closes: #175039).
+ * Already fixed, but not closed (Closes: #317889, #328558).
+
+ -- Luk Claes <[EMAIL PROTECTED]> Tue, 18 Oct 2005 18:47:06 +0200
+
avifile (1:0.7.43.20050224-1) unstable; urgency=low
* updated to latest ffmpeg
* fix packaging (Closes: 252982, 259417, 295486)
diff -Nru /tmp/9NXb7ZiJab/avifile-0.7.43.20050224/debian/control
/tmp/ZUeXaisFMJ/avifile-0.7.43.20050224/debian/control
--- /tmp/9NXb7ZiJab/avifile-0.7.43.20050224/debian/control 2005-02-24
13:46:22.000000000 +0100
+++ /tmp/ZUeXaisFMJ/avifile-0.7.43.20050224/debian/control 2005-10-17
18:49:27.000000000 +0200
@@ -5,13 +5,13 @@
Standards-Version: 3.5.8
Build-Depends: debhelper (>= 2.0), libqt3-mt-dev (>= 3:3.1.1-2), libsdl1.2-dev
| libsdl1.1-dev | libsdl1.0-dev , libaudiofile-dev, libjpeg62-dev,
libvorbis-dev, libogg-dev, libmad0-dev, libxft-dev, autoconf (>= 2.13-1),
automake (>= 1.4-1) | automake1.7 | automake1.8 | automake1.4 , libtool,
gettext, patch, netpbm | pnmtopng
-Package: libavifile-0.7c102
+Package: libavifile-0.7c2
Architecture: any
Section: libs
Suggests: avifile-player, avifile-utils, avifile-mad-plugin,
avifile-mjpeg-plugin, avifile-vorbis-plugin, avifile-win32-plugin,
avifile-xvid-plugin, avifile-divx-plugin
Depends: ${shlibs:Depends}
-Replaces: libavifile0.7, libavifile0.7c102
-Conflicts: libavifile0.7, libavifile0.7c102
+Replaces: libavifile0.7, libavifile0.7c102, libavifile-0.7c102
+Conflicts: libavifile0.7, libavifile0.7c102, libavifile-0.7c102
Description: shared libraries for AVI read/writing
Library that allows programs to read and write compressed
AVI files (Indeo Video, DivX :-), etc.) under x86 Linux.
@@ -24,7 +24,7 @@
Package: libavifile-0.7-dev
Architecture: any
Section: devel
-Depends: libavifile-0.7c102 (= ${Source-Version}), libxft-dev, libxrender-dev
+Depends: libavifile-0.7c2 (= ${Source-Version}), libxft-dev, libxrender-dev
Replaces: libaviplay, libavifile-dev, libavifile0.6-dev, libavifile0.7-dev
Conflicts: libavifile-0.7c102 (<= 1:0.7.42.20050215-1), libavifile-dev,
libavifile0.6, libavifile-0.6-dev, libavifile0.7-dev
Description: development header files for libavifile
diff -Nru /tmp/9NXb7ZiJab/avifile-0.7.43.20050224/debian/copyright
/tmp/ZUeXaisFMJ/avifile-0.7.43.20050224/debian/copyright
--- /tmp/9NXb7ZiJab/avifile-0.7.43.20050224/debian/copyright 2003-02-27
15:39:19.000000000 +0100
+++ /tmp/ZUeXaisFMJ/avifile-0.7.43.20050224/debian/copyright 2005-10-18
18:36:18.000000000 +0200
@@ -6,5 +6,13 @@
Freely downloadable binary codecs.
-Copyright: GPL (see /usr/share/common-licenses/GPL)
+ffmpeg copyright: (c) 2000-2004 Fabrice Bellard et al.
+ffmpeg/libavcodec/ppc/dsputil_altivec.c copyright:
+(c) 2002 Brian Foley
+(c) 2003 Dieter Shirley
+(c) 2003-2004 Romain Dolbeau <[EMAIL PROTECTED]>
+ffmpeg/libavcodec/ppc/mpegvideo_ppc.c copyright:
+(c) 2002 Dieter Shirley
+
+GPL (see /usr/share/common-licenses/GPL)
and LGPL (see /usr/share/common-licenses/LGPL)
diff -Nru
/tmp/9NXb7ZiJab/avifile-0.7.43.20050224/debian/libavifile-0.7c102.lintian
/tmp/ZUeXaisFMJ/avifile-0.7.43.20050224/debian/libavifile-0.7c102.lintian
--- /tmp/9NXb7ZiJab/avifile-0.7.43.20050224/debian/libavifile-0.7c102.lintian
2003-07-10 15:23:38.000000000 +0200
+++ /tmp/ZUeXaisFMJ/avifile-0.7.43.20050224/debian/libavifile-0.7c102.lintian
1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-libavifile-0.7c102: changelog-not-compressed-with-max-compression ChangeLog.gz
-libavifile-0.7c102: binary-or-shlib-defines-rpath
./usr/lib/libaviplay-0.7.so.0.0.38 /usr/X11R6/lib
-
diff -Nru /tmp/9NXb7ZiJab/avifile-0.7.43.20050224/debian/rules
/tmp/ZUeXaisFMJ/avifile-0.7.43.20050224/debian/rules
--- /tmp/9NXb7ZiJab/avifile-0.7.43.20050224/debian/rules 2005-02-24
14:11:30.000000000 +0100
+++ /tmp/ZUeXaisFMJ/avifile-0.7.43.20050224/debian/rules 2005-10-18
19:47:12.000000000 +0200
@@ -26,7 +26,7 @@
package = avifile
version = -0.7
aviversion = $(package)$(version)
-libraries = lib$(aviversion)c102
+libraries = lib$(aviversion)c2
#DH2 using normal name
#tmp
devel = lib$(aviversion)-dev
@@ -218,7 +218,7 @@
# trick to allow build empty packages
# avoid problem with trailing ','
@for i in $(allplugins) ; do if test ! -e debian/$$i.substvars ; then \
- echo "shlibs:Depends=libavifile-0.7c102 (>=
1:0.7.43.20050224-1), libc6" > debian/$$i.substvars ; \
+ echo "shlibs:Depends=libavifile-0.7c2 (>= 1:0.7.43.20050224-1),
libc6" > debian/$$i.substvars ; \
fi ; done
dh_shlibdeps -Xxvid4 -Xdivx4
-ldebian/$(libraries)/usr/lib:debian/$(player)/usr/lib
diff -Nru /tmp/9NXb7ZiJab/avifile-0.7.43.20050224/ffmpeg/libavcodec/avcodec.h
/tmp/ZUeXaisFMJ/avifile-0.7.43.20050224/ffmpeg/libavcodec/avcodec.h
--- /tmp/9NXb7ZiJab/avifile-0.7.43.20050224/ffmpeg/libavcodec/avcodec.h
2005-02-24 12:31:10.000000000 +0100
+++ /tmp/ZUeXaisFMJ/avifile-0.7.43.20050224/ffmpeg/libavcodec/avcodec.h
2005-10-17 19:42:52.000000000 +0200
@@ -1813,6 +1813,13 @@
#define FF_OPT_MAX_DEPTH 10
} AVOption;
+#ifdef HAVE_MMX
+extern const struct AVOption avoptions_common[3 +5];
+#else
+extern const struct AVOption avoptions_common[3];
+#endif
+extern const struct AVOption avoptions_workaround_bug[11];
+
/**
* Parse option(s) and sets fields in passed structure
* @param strct structure where the parsed results will be written
diff -Nru /tmp/9NXb7ZiJab/avifile-0.7.43.20050224/ffmpeg/libavcodec/common.h
/tmp/ZUeXaisFMJ/avifile-0.7.43.20050224/ffmpeg/libavcodec/common.h
--- /tmp/9NXb7ZiJab/avifile-0.7.43.20050224/ffmpeg/libavcodec/common.h
2005-02-15 13:33:33.000000000 +0100
+++ /tmp/ZUeXaisFMJ/avifile-0.7.43.20050224/ffmpeg/libavcodec/common.h
2005-10-17 19:43:50.000000000 +0200
@@ -53,15 +53,6 @@
{ name, help, offsetof(AVCodecContext, field), FF_OPT_TYPE_RCOVERRIDE,
.defval = 0, .defstr = NULL }
#define AVOPTION_SUB(ptr) { .name = NULL, .help = (const char*)ptr }
#define AVOPTION_END() AVOPTION_SUB(NULL)
-
-struct AVOption;
-#ifdef HAVE_MMX
-extern const struct AVOption avoptions_common[3 + 5];
-#else
-extern const struct AVOption avoptions_common[3];
-#endif
-extern const struct AVOption avoptions_workaround_bug[11];
-
#endif /* HAVE_AV_CONFIG_H */
/* Suppress restrict if it was not defined in config.h. */
diff -Nru /tmp/9NXb7ZiJab/avifile-0.7.43.20050224/ffmpeg/libavcodec/dsputil.h
/tmp/ZUeXaisFMJ/avifile-0.7.43.20050224/ffmpeg/libavcodec/dsputil.h
--- /tmp/9NXb7ZiJab/avifile-0.7.43.20050224/ffmpeg/libavcodec/dsputil.h
2005-02-15 13:33:34.000000000 +0100
+++ /tmp/ZUeXaisFMJ/avifile-0.7.43.20050224/ffmpeg/libavcodec/dsputil.h
2005-10-17 19:44:48.000000000 +0200
@@ -604,33 +604,4 @@
return score;\
}
-#ifndef HAVE_LRINTF
-/* XXX: add ISOC specific test to avoid specific BSD testing. */
-/* better than nothing implementation. */
-/* btw, rintf() is existing on fbsd too -- alex */
-static always_inline long int lrintf(float x)
-{
-#ifdef CONFIG_WIN32
-# ifdef ARCH_X86
- int32_t i;
- asm volatile(
- "fistpl %0\n\t"
- : "=m" (i) : "t" (x) : "st"
- );
- return i;
-# else
- /* XXX: incorrect, but make it compile */
- return (int)(x + (x < 0 ? -0.5 : 0.5));
-# endif
-#else
- return (int)(rint(x));
-#endif
-}
-#else
-#ifndef _ISOC9X_SOURCE
-#define _ISOC9X_SOURCE
-#endif
-#include <math.h>
-#endif
-
#endif
diff -Nru /tmp/9NXb7ZiJab/avifile-0.7.43.20050224/lib/aviplay/AudioQueue.h
/tmp/ZUeXaisFMJ/avifile-0.7.43.20050224/lib/aviplay/AudioQueue.h
--- /tmp/9NXb7ZiJab/avifile-0.7.43.20050224/lib/aviplay/AudioQueue.h
2004-08-25 18:29:06.000000000 +0200
+++ /tmp/ZUeXaisFMJ/avifile-0.7.43.20050224/lib/aviplay/AudioQueue.h
2005-10-17 19:45:50.000000000 +0200
@@ -16,10 +16,11 @@
virtual int Mix(void* data, const void* src, uint_t n) const = 0;
};
+#define MAX_BUFFER_TIME 1.0;
+
class AudioQueue
{
public:
- static const double MAX_BUFFER_TIME = 1.0;
AudioQueue(WAVEFORMATEX& Iwf, WAVEFORMATEX& Owf);
~AudioQueue();
diff -Nru /tmp/9NXb7ZiJab/avifile-0.7.43.20050224/lib/aviplay/aviplay_impl.h
/tmp/ZUeXaisFMJ/avifile-0.7.43.20050224/lib/aviplay/aviplay_impl.h
--- /tmp/9NXb7ZiJab/avifile-0.7.43.20050224/lib/aviplay/aviplay_impl.h
2003-12-17 21:37:54.000000000 +0100
+++ /tmp/ZUeXaisFMJ/avifile-0.7.43.20050224/lib/aviplay/aviplay_impl.h
2005-10-17 19:46:10.000000000 +0200
@@ -136,8 +136,6 @@
void createAudioRenderer();
int restartVideoStreaming(const char* codec = 0);
- static const float m_fDropLimit = -0.015;
-
mutable int AviPlayer::propertyRead[LAST_PROPERTY]; // have we read at
least once from Registry::
avm::vector<IVideoRenderer*> m_VideoRenderers; // we could draw image to
more places
diff -Nru /tmp/9NXb7ZiJab/avifile-0.7.43.20050224/lib/aviplay/aviplayth.cpp
/tmp/ZUeXaisFMJ/avifile-0.7.43.20050224/lib/aviplay/aviplayth.cpp
--- /tmp/9NXb7ZiJab/avifile-0.7.43.20050224/lib/aviplay/aviplayth.cpp
2004-10-25 12:27:42.000000000 +0200
+++ /tmp/ZUeXaisFMJ/avifile-0.7.43.20050224/lib/aviplay/aviplayth.cpp
2005-10-17 19:46:54.000000000 +0200
@@ -31,6 +31,7 @@
// preffer video playing thread
static const int PRIORITY_ADD_VIDEO = 0;
static const int PRIORITY_ADD_AUDIO = 0;
+static const float m_fDropLimit = -0.015;
float AviPlayer::getVideoAsync()
{
diff -Nru /tmp/9NXb7ZiJab/avifile-0.7.43.20050224/lib/aviread/ReadFile.cpp
/tmp/ZUeXaisFMJ/avifile-0.7.43.20050224/lib/aviread/ReadFile.cpp
--- /tmp/9NXb7ZiJab/avifile-0.7.43.20050224/lib/aviread/ReadFile.cpp
2004-03-10 18:00:09.000000000 +0100
+++ /tmp/ZUeXaisFMJ/avifile-0.7.43.20050224/lib/aviread/ReadFile.cpp
2005-10-18 19:12:01.000000000 +0200
@@ -125,7 +125,7 @@
};
-avm::IReadFile* avm::CreateReadFile(const char* name, unsigned int flags)
+IReadFile* CreateReadFile(const char* name, unsigned int flags)
{
ReadFile* r = new ReadFile(name, flags);
return r;
diff -Nru
/tmp/9NXb7ZiJab/avifile-0.7.43.20050224/plugins/libwin32/loader/Makefile.am
/tmp/ZUeXaisFMJ/avifile-0.7.43.20050224/plugins/libwin32/loader/Makefile.am
--- /tmp/9NXb7ZiJab/avifile-0.7.43.20050224/plugins/libwin32/loader/Makefile.am
2005-02-15 13:33:41.000000000 +0100
+++ /tmp/ZUeXaisFMJ/avifile-0.7.43.20050224/plugins/libwin32/loader/Makefile.am
2005-10-17 18:54:39.000000000 +0200
@@ -50,7 +50,7 @@
AM_CPPFLAGS = $(LTNOPIC) -DAVIFILE $(WINFLAGS) -Wmissing-prototypes
-Wimplicit-function-declaration
# -mno-omit-leaf-frame-pointer added to workaround bug with WMV8 and gcc-3.2
-AM_CFLAGS = -fno-omit-frame-pointer
+AM_CFLAGS = #-fno-omit-frame-pointer
#-mno-omit-leaf-frame-pointer
CFLAGS = $(WIN32_CFLAGS)
#-O2 -ffast-math
diff -Nru
/tmp/9NXb7ZiJab/avifile-0.7.43.20050224/samples/qtvidcap/kv4lsetup.cpp
/tmp/ZUeXaisFMJ/avifile-0.7.43.20050224/samples/qtvidcap/kv4lsetup.cpp
--- /tmp/9NXb7ZiJab/avifile-0.7.43.20050224/samples/qtvidcap/kv4lsetup.cpp
2004-11-04 14:43:49.000000000 +0100
+++ /tmp/ZUeXaisFMJ/avifile-0.7.43.20050224/samples/qtvidcap/kv4lsetup.cpp
2005-10-17 19:48:22.000000000 +0200
@@ -311,7 +311,7 @@
fbuf.depth = set_bpp;
fbuf.bytesperline = set_bpl;
if (set_base != NULL)
- fbuf.base = (void*)((unsigned int)set_base+(unsigned int)shift);
+ fbuf.base = (void*)((unsigned long)set_base+(unsigned long)shift);
/* XXX bttv confuses color depth and bits/pixel */
#ifndef X_DISPLAY_MISSING
diff -Nru /tmp/9NXb7ZiJab/avifile-0.7.43.20050224/samples/qtvidcap/v4lxif.cpp
/tmp/ZUeXaisFMJ/avifile-0.7.43.20050224/samples/qtvidcap/v4lxif.cpp
--- /tmp/9NXb7ZiJab/avifile-0.7.43.20050224/samples/qtvidcap/v4lxif.cpp
2004-11-04 14:43:50.000000000 +0100
+++ /tmp/ZUeXaisFMJ/avifile-0.7.43.20050224/samples/qtvidcap/v4lxif.cpp
2005-10-17 19:50:06.000000000 +0200
@@ -1118,7 +1118,7 @@
XF86DGAGetVideoLL(disp, DefaultScreen(disp), (int *)&base,
&width, &bank, &ram );
if (!base)
avml(AVML_WARN,
- "v4l1: can not allocate frame buffer base:
0x%x\n",(int)base);
+ "v4l1: can not allocate frame buffer base:
0lx%x\n",(long)base);
}
}
}
