r1074 - /experimental/ffmpeg.20080206/debian/patches/
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Mar 16 08:48:04 UTC 2008
Author: siretart
Date: Sun Mar 16 08:48:04 2008
New Revision: 1074
URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1074
Log:
update patches for ffmpeg snapshot 20080206
Modified:
experimental/ffmpeg.20080206/debian/patches/005_m68k_workaround.diff
experimental/ffmpeg.20080206/debian/patches/005_runtime_cpudetect.diff
experimental/ffmpeg.20080206/debian/patches/006_mips_pthreads.diff
experimental/ffmpeg.20080206/debian/patches/010_ffmpeg-config.diff
experimental/ffmpeg.20080206/debian/patches/010_proper_rpath.diff
experimental/ffmpeg.20080206/debian/patches/010_shared_library_versioning.diff
experimental/ffmpeg.20080206/debian/patches/011_link_plugins.diff
experimental/ffmpeg.20080206/debian/patches/013_strip_unneeded_linker_flags.diff
experimental/ffmpeg.20080206/debian/patches/015_build_imgresample.diff
experimental/ffmpeg.20080206/debian/patches/020_disable_snow_mmx_in_pic.diff
experimental/ffmpeg.20080206/debian/patches/020_fix_libswscale_pic_code
experimental/ffmpeg.20080206/debian/patches/020_mmx_optims.diff
experimental/ffmpeg.20080206/debian/patches/020_mmx_pic_code.diff
experimental/ffmpeg.20080206/debian/patches/054_h264_mmx_chroma_mc_crash.diff
experimental/ffmpeg.20080206/debian/patches/300_c++_compliant_headers.diff
Modified: experimental/ffmpeg.20080206/debian/patches/005_m68k_workaround.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg.20080206/debian/patches/005_m68k_workaround.diff?rev=1074&op=diff
==============================================================================
--- experimental/ffmpeg.20080206/debian/patches/005_m68k_workaround.diff (original)
+++ experimental/ffmpeg.20080206/debian/patches/005_m68k_workaround.diff Sun Mar 16 08:48:04 2008
@@ -1,8 +1,8 @@
-Index: trunk/configure
+Index: ffmpeg.20080206/configure
===================================================================
---- trunk.orig/configure 2007-12-09 20:53:01.000000000 +0100
-+++ trunk/configure 2007-12-09 20:54:22.000000000 +0100
-@@ -1708,6 +1708,8 @@
+--- ffmpeg.20080206.orig/configure 2008-02-03 23:31:25.000000000 +0100
++++ ffmpeg.20080206/configure 2008-03-15 22:44:15.000000000 +0100
+@@ -1801,6 +1801,8 @@
if test -n "`$cc -v 2>&1 | grep xlc`"; then
add_cflags "-O5"
add_ldflags "-O5"
Modified: experimental/ffmpeg.20080206/debian/patches/005_runtime_cpudetect.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg.20080206/debian/patches/005_runtime_cpudetect.diff?rev=1074&op=diff
==============================================================================
--- experimental/ffmpeg.20080206/debian/patches/005_runtime_cpudetect.diff (original)
+++ experimental/ffmpeg.20080206/debian/patches/005_runtime_cpudetect.diff Sun Mar 16 08:48:04 2008
@@ -1,9 +1,9 @@
-Index: trunk/configure
+Index: ffmpeg.20080206/configure
===================================================================
---- trunk.orig/configure 2007-12-09 20:54:22.000000000 +0100
-+++ trunk/configure 2007-12-09 20:54:37.000000000 +0100
-@@ -1877,6 +1877,10 @@
- echo "#define __CPU__ 586" >> $TMPH
+--- ffmpeg.20080206.orig/configure 2008-03-15 22:44:15.000000000 +0100
++++ ffmpeg.20080206/configure 2008-03-15 22:46:09.000000000 +0100
+@@ -1997,6 +1997,10 @@
+ echo "#define __CPU__ 586" >> $TMPH
fi
+if test "$cpu" != "m68k" -a "$cpu" != "x86" ; then
@@ -11,5 +11,5 @@
+fi
+
if enabled sdl; then
- echo "SDL_LIBS=`"${SDL_CONFIG}" --libs`" >> config.mak
- echo "SDL_CFLAGS=`"${SDL_CONFIG}" --cflags`" >> config.mak
+ echo "SDL_LIBS=`"${SDL_CONFIG}" --libs`" >> config.mak
+ echo "SDL_CFLAGS=`"${SDL_CONFIG}" --cflags`" >> config.mak
Modified: experimental/ffmpeg.20080206/debian/patches/006_mips_pthreads.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg.20080206/debian/patches/006_mips_pthreads.diff?rev=1074&op=diff
==============================================================================
--- experimental/ffmpeg.20080206/debian/patches/006_mips_pthreads.diff (original)
+++ experimental/ffmpeg.20080206/debian/patches/006_mips_pthreads.diff Sun Mar 16 08:48:04 2008
@@ -1,8 +1,8 @@
-Index: trunk/configure
+Index: ffmpeg.20080206/configure
===================================================================
---- trunk.orig/configure 2007-12-09 20:54:37.000000000 +0100
-+++ trunk/configure 2007-12-09 20:54:40.000000000 +0100
-@@ -1524,6 +1524,10 @@
+--- ffmpeg.20080206.orig/configure 2008-03-15 22:46:09.000000000 +0100
++++ ffmpeg.20080206/configure 2008-03-15 22:51:31.000000000 +0100
+@@ -1602,6 +1602,10 @@
# check for some common methods of building with pthread support
# do this before the optional library checks as some of them require pthreads
if enabled pthreads; then
Modified: experimental/ffmpeg.20080206/debian/patches/010_ffmpeg-config.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg.20080206/debian/patches/010_ffmpeg-config.diff?rev=1074&op=diff
==============================================================================
--- experimental/ffmpeg.20080206/debian/patches/010_ffmpeg-config.diff (original)
+++ experimental/ffmpeg.20080206/debian/patches/010_ffmpeg-config.diff Sun Mar 16 08:48:04 2008
@@ -1,7 +1,7 @@
-Index: ffmpeg-0.cvs20060625/ffmpeg-config.in
+Index: ffmpeg.20080206/ffmpeg-config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ ffmpeg-0.cvs20060625/ffmpeg-config.in 2006-06-25 20:22:31.000000000 +0200
++++ ffmpeg.20080206/ffmpeg-config.in 2008-03-15 22:52:16.000000000 +0100
@@ -0,0 +1,92 @@
+#!/bin/sh
+
@@ -95,10 +95,10 @@
+if test "$echo_version" = "yes"; then
+ echo $version
+fi
-Index: ffmpeg-0.cvs20060625/ffmpeg-config.1
+Index: ffmpeg.20080206/ffmpeg-config.1
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ ffmpeg-0.cvs20060625/ffmpeg-config.1 2006-06-25 20:22:31.000000000 +0200
++++ ffmpeg.20080206/ffmpeg-config.1 2008-03-15 22:52:16.000000000 +0100
@@ -0,0 +1,52 @@
+.TH ffmpeg-config 1 "2004-07-16" "ffmpeg"
+.SH NAME
Modified: experimental/ffmpeg.20080206/debian/patches/010_proper_rpath.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg.20080206/debian/patches/010_proper_rpath.diff?rev=1074&op=diff
==============================================================================
--- experimental/ffmpeg.20080206/debian/patches/010_proper_rpath.diff (original)
+++ experimental/ffmpeg.20080206/debian/patches/010_proper_rpath.diff Sun Mar 16 08:48:04 2008
@@ -1,8 +1,8 @@
-Index: trunk/configure
+Index: ffmpeg.20080206/configure
===================================================================
---- trunk.orig/configure 2007-12-09 20:54:40.000000000 +0100
-+++ trunk/configure 2007-12-09 20:54:46.000000000 +0100
-@@ -889,7 +889,7 @@
+--- ffmpeg.20080206.orig/configure 2008-03-15 22:51:31.000000000 +0100
++++ ffmpeg.20080206/configure 2008-03-15 22:51:58.000000000 +0100
+@@ -922,7 +922,7 @@
# build settings
SHFLAGS='-shared -Wl,-soname,$@'
VHOOKSHFLAGS='$(SHFLAGS)'
Modified: experimental/ffmpeg.20080206/debian/patches/010_shared_library_versioning.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg.20080206/debian/patches/010_shared_library_versioning.diff?rev=1074&op=diff
==============================================================================
--- experimental/ffmpeg.20080206/debian/patches/010_shared_library_versioning.diff (original)
+++ experimental/ffmpeg.20080206/debian/patches/010_shared_library_versioning.diff Sun Mar 16 08:48:04 2008
@@ -1,25 +1,27 @@
-Index: trunk/configure
+Index: ffmpeg.20080206/configure
===================================================================
---- trunk.orig/configure 2007-12-16 20:53:43.000000000 +0100
-+++ trunk/configure 2007-12-16 20:53:44.000000000 +0100
-@@ -1893,11 +1893,11 @@
- echo "BUILD_DOC=yes" >> config.mak
+--- ffmpeg.20080206.orig/configure 2008-03-15 22:51:58.000000000 +0100
++++ ffmpeg.20080206/configure 2008-03-15 22:55:15.000000000 +0100
+@@ -2013,12 +2013,12 @@
+ echo "BUILD_DOC=yes" >> config.mak
fi
-sws_version=`grep '#define LIBSWSCALE_VERSION ' "$source_path/libswscale/swscale.h" | sed 's/[^0-9\.]//g'`
-pp_version=`grep '#define LIBPOSTPROC_VERSION ' "$source_path/libpostproc/postprocess.h" | sed 's/[^0-9\.]//g'`
-lavc_version=`grep '#define LIBAVCODEC_VERSION ' "$source_path/libavcodec/avcodec.h" | sed 's/[^0-9\.]//g'`
+-lavd_version=`grep '#define LIBAVDEVICE_VERSION ' "$source_path/libavdevice/avdevice.h" | sed 's/[^0-9\.]//g'`
-lavf_version=`grep '#define LIBAVFORMAT_VERSION ' "$source_path/libavformat/avformat.h" | sed 's/[^0-9\.]//g'`
-lavu_version=`grep '#define LIBAVUTIL_VERSION ' "$source_path/libavutil/avutil.h" | sed 's/[^0-9\.]//g'`
+sws_version=`grep '#define LIBSWSCALE_VERSION ' "$source_path/libswscale/swscale.h" | sed 's/[^0-9\.]*//'`
+pp_version=`grep '#define LIBPOSTPROC_VERSION ' "$source_path/libpostproc/postprocess.h" | sed 's/[^0-9\.]*//'`
+lavc_version=`grep '#define LIBAVCODEC_VERSION ' "$source_path/libavcodec/avcodec.h" | sed 's/[^0-9\.]*//'`
++lavd_version=`grep '#define LIBAVDEVICE_VERSION ' "$source_path/libavdevice/avdevice.h" | sed 's/[^0-9\.]*//'`
+lavf_version=`grep '#define LIBAVFORMAT_VERSION ' "$source_path/libavformat/avformat.h" | sed 's/[^0-9\.]*//'`
+lavu_version=`grep '#define LIBAVUTIL_VERSION ' "$source_path/libavutil/avutil.h" | sed 's/[^0-9\.]*//'`
-@@ -2003,9 +2003,9 @@
+@@ -2134,9 +2134,9 @@
pkgconfig_generate(){
name=$1
comment=$2
@@ -31,7 +33,7 @@
include=$6
cat <<EOF >$name.pc
prefix=$PREFIX
-@@ -2027,9 +2027,9 @@
+@@ -2158,9 +2158,9 @@
name=$1
shortname=${name#lib}
comment=$2
@@ -43,24 +45,24 @@
cat <<EOF >$name-uninstalled.pc
prefix=
exec_prefix=
-Index: trunk/libavformat/avformat.h
+Index: ffmpeg.20080206/libavformat/avformat.h
===================================================================
---- trunk.orig/libavformat/avformat.h 2007-12-15 22:10:17.000000000 +0100
-+++ trunk/libavformat/avformat.h 2007-12-16 20:53:44.000000000 +0100
+--- ffmpeg.20080206.orig/libavformat/avformat.h 2008-01-29 10:25:49.000000000 +0100
++++ ffmpeg.20080206/libavformat/avformat.h 2008-03-15 22:55:39.000000000 +0100
@@ -22,7 +22,7 @@
- #define AVFORMAT_H
+ #define FFMPEG_AVFORMAT_H
- #define LIBAVFORMAT_VERSION_INT ((51<<16)+(14<<8)+0)
--#define LIBAVFORMAT_VERSION 51.14.0
-+#define LIBAVFORMAT_VERSION 1d.51.14.0
+ #define LIBAVFORMAT_VERSION_INT ((52<<16)+(7<<8)+0)
+-#define LIBAVFORMAT_VERSION 52.7.0
++#define LIBAVFORMAT_VERSION 1d.52.7.0
#define LIBAVFORMAT_BUILD LIBAVFORMAT_VERSION_INT
#define LIBAVFORMAT_IDENT "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION)
-Index: trunk/common.mak
+Index: ffmpeg.20080206/common.mak
===================================================================
---- trunk.orig/common.mak 2007-12-15 22:10:17.000000000 +0100
-+++ trunk/common.mak 2007-12-16 20:53:44.000000000 +0100
-@@ -76,7 +76,7 @@
+--- ffmpeg.20080206.orig/common.mak 2008-01-28 00:28:56.000000000 +0100
++++ ffmpeg.20080206/common.mak 2008-03-15 22:52:54.000000000 +0100
+@@ -71,7 +71,7 @@
cd "$(SHLIBDIR)" && \
$(LN_S) $(SLIBNAME_WITH_VERSION) $(SLIBNAME_WITH_MAJOR)
cd "$(SHLIBDIR)" && \
@@ -68,11 +70,11 @@
+ $(LN_S) $(SLIBNAME_WITH_MAJOR) $(SLIBNAME)
$(SLIB_INSTALL_EXTRA_CMD)
- install-lib-static: $(LIB)
-Index: trunk/libpostproc/postprocess.h
+ install-lib-static: $(LIBNAME)
+Index: ffmpeg.20080206/libpostproc/postprocess.h
===================================================================
---- trunk.orig/libpostproc/postprocess.h 2007-12-15 22:10:17.000000000 +0100
-+++ trunk/libpostproc/postprocess.h 2007-12-16 20:53:44.000000000 +0100
+--- ffmpeg.20080206.orig/libpostproc/postprocess.h 2008-02-02 22:24:54.000000000 +0100
++++ ffmpeg.20080206/libpostproc/postprocess.h 2008-03-15 22:52:54.000000000 +0100
@@ -28,7 +28,7 @@
*/
@@ -82,10 +84,10 @@
#define LIBPOSTPROC_BUILD LIBPOSTPROC_VERSION_INT
#define LIBPOSTPROC_IDENT "postproc" AV_STRINGIFY(LIBPOSTPROC_VERSION)
-Index: trunk/libswscale/swscale.h
+Index: ffmpeg.20080206/libswscale/swscale.h
===================================================================
---- trunk.orig/libswscale/swscale.h 2007-12-15 22:10:17.000000000 +0100
-+++ trunk/libswscale/swscale.h 2007-12-16 20:53:44.000000000 +0100
+--- ffmpeg.20080206.orig/libswscale/swscale.h 2007-10-18 11:30:33.000000000 +0200
++++ ffmpeg.20080206/libswscale/swscale.h 2008-03-15 22:52:54.000000000 +0100
@@ -33,7 +33,7 @@
#define AV_TOSTRING(s) #s
@@ -95,29 +97,29 @@
#define LIBSWSCALE_BUILD LIBSWSCALE_VERSION_INT
#define LIBSWSCALE_IDENT "SwS" AV_STRINGIFY(LIBSWSCALE_VERSION)
-Index: trunk/libavcodec/avcodec.h
+Index: ffmpeg.20080206/libavcodec/avcodec.h
===================================================================
---- trunk.orig/libavcodec/avcodec.h 2007-12-15 22:10:17.000000000 +0100
-+++ trunk/libavcodec/avcodec.h 2007-12-16 20:53:44.000000000 +0100
+--- ffmpeg.20080206.orig/libavcodec/avcodec.h 2008-02-02 23:54:50.000000000 +0100
++++ ffmpeg.20080206/libavcodec/avcodec.h 2008-03-15 22:59:25.000000000 +0100
@@ -34,7 +34,7 @@
#define AV_TOSTRING(s) #s
- #define LIBAVCODEC_VERSION_INT ((51<<16)+(44<<8)+0)
--#define LIBAVCODEC_VERSION 51.44.0
-+#define LIBAVCODEC_VERSION 1d.51.44.0
+ #define LIBAVCODEC_VERSION_INT ((51<<16)+(50<<8)+0)
+-#define LIBAVCODEC_VERSION 51.50.0
++#define LIBAVCODEC_VERSION 1d.51.50.0
#define LIBAVCODEC_BUILD LIBAVCODEC_VERSION_INT
#define LIBAVCODEC_IDENT "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
-Index: trunk/libavutil/avutil.h
+Index: ffmpeg.20080206/libavutil/avutil.h
===================================================================
---- trunk.orig/libavutil/avutil.h 2007-12-16 20:54:27.000000000 +0100
-+++ trunk/libavutil/avutil.h 2007-12-16 20:54:35.000000000 +0100
+--- ffmpeg.20080206.orig/libavutil/avutil.h 2008-01-28 18:23:57.000000000 +0100
++++ ffmpeg.20080206/libavutil/avutil.h 2008-03-15 23:00:10.000000000 +0100
@@ -31,7 +31,7 @@
#define AV_TOSTRING(s) #s
- #define LIBAVUTIL_VERSION_INT ((49<<16)+(5<<8)+0)
--#define LIBAVUTIL_VERSION 49.5.0
-+#define LIBAVUTIL_VERSION 1d.49.5.0
+ #define LIBAVUTIL_VERSION_INT ((49<<16)+(6<<8)+0)
+-#define LIBAVUTIL_VERSION 49.6.0
++#define LIBAVUTIL_VERSION 1d.49.6.0
#define LIBAVUTIL_BUILD LIBAVUTIL_VERSION_INT
#define LIBAVUTIL_IDENT "Lavu" AV_STRINGIFY(LIBAVUTIL_VERSION)
Modified: experimental/ffmpeg.20080206/debian/patches/011_link_plugins.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg.20080206/debian/patches/011_link_plugins.diff?rev=1074&op=diff
==============================================================================
--- experimental/ffmpeg.20080206/debian/patches/011_link_plugins.diff (original)
+++ experimental/ffmpeg.20080206/debian/patches/011_link_plugins.diff Sun Mar 16 08:48:04 2008
@@ -1,8 +1,8 @@
-Index: trunk/Makefile
+Index: ffmpeg.20080206/Makefile
===================================================================
---- trunk.orig/Makefile 2007-12-09 20:53:01.000000000 +0100
-+++ trunk/Makefile 2007-12-09 20:54:54.000000000 +0100
-@@ -48,11 +48,16 @@
+--- ffmpeg.20080206.orig/Makefile 2008-02-03 20:26:29.000000000 +0100
++++ ffmpeg.20080206/Makefile 2008-03-15 23:03:24.000000000 +0100
+@@ -52,11 +52,16 @@
HOOKS = $(addprefix vhook/, $(addsuffix $(SLIBSUF), $(BASEHOOKS) $(HOOKS-yes)))
Modified: experimental/ffmpeg.20080206/debian/patches/013_strip_unneeded_linker_flags.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg.20080206/debian/patches/013_strip_unneeded_linker_flags.diff?rev=1074&op=diff
==============================================================================
--- experimental/ffmpeg.20080206/debian/patches/013_strip_unneeded_linker_flags.diff (original)
+++ experimental/ffmpeg.20080206/debian/patches/013_strip_unneeded_linker_flags.diff Sun Mar 16 08:48:04 2008
@@ -1,8 +1,8 @@
-Index: trunk/configure
+Index: ffmpeg.20080206/configure
===================================================================
---- trunk.orig/configure 2007-12-09 20:54:52.000000000 +0100
-+++ trunk/configure 2007-12-09 20:54:58.000000000 +0100
-@@ -2049,11 +2049,11 @@
+--- ffmpeg.20080206.orig/configure 2008-03-15 22:55:15.000000000 +0100
++++ ffmpeg.20080206/configure 2008-03-15 23:03:37.000000000 +0100
+@@ -2180,11 +2180,11 @@
pkgconfig_generate libavutil "FFmpeg utility library" "$lavu_version" -lavutil "" ffmpeg
pkgconfig_generate_uninstalled libavutil "FFmpeg utility library" "$lavu_version"
@@ -16,5 +16,5 @@
+pkgconfig_generate libavformat "FFmpeg container format library" "$lavf_version" "-lavformat" "$pkg_requires libavcodec = $lavc_version" ffmpeg
+pkgconfig_generate_uninstalled libavformat "FFmpeg container format library" "$lavf_version" "" "$pkg_requires libavcodec = $lavc_version"
- if enabled pp; then
- pkgconfig_generate libpostproc "FFmpeg post processing library" "$pp_version" -lpostproc "" postproc
+ pkgconfig_generate libavdevice "FFmpeg device handling library" "$lavd_version" "-lavdevice $extralibs" "$pkg_requires libavformat = $lavf_version" ffmpeg
+ pkgconfig_generate_uninstalled libavdevice "FFmpeg device handling library" "$lavd_version" "$extralibs" "$pkg_requires libavformat = $lavf_version"
Modified: experimental/ffmpeg.20080206/debian/patches/015_build_imgresample.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg.20080206/debian/patches/015_build_imgresample.diff?rev=1074&op=diff
==============================================================================
--- experimental/ffmpeg.20080206/debian/patches/015_build_imgresample.diff (original)
+++ experimental/ffmpeg.20080206/debian/patches/015_build_imgresample.diff Sun Mar 16 08:48:04 2008
@@ -1,8 +1,8 @@
-Index: trunk/libavcodec/Makefile
+Index: ffmpeg.20080206/libavcodec/Makefile
===================================================================
---- trunk.orig/libavcodec/Makefile 2007-12-09 20:53:01.000000000 +0100
-+++ trunk/libavcodec/Makefile 2007-12-09 20:55:02.000000000 +0100
-@@ -338,9 +338,7 @@
+--- ffmpeg.20080206.orig/libavcodec/Makefile 2008-01-28 22:24:09.000000000 +0100
++++ ffmpeg.20080206/libavcodec/Makefile 2008-03-15 23:09:24.000000000 +0100
+@@ -351,9 +351,7 @@
OBJS-$(HAVE_XVMC_ACCEL) += xvmcvideo.o
@@ -12,10 +12,10 @@
# processor-specific code
ifeq ($(HAVE_MMX),yes)
-Index: trunk/libavcodec/imgconvert.c
+Index: ffmpeg.20080206/libavcodec/imgconvert.c
===================================================================
---- trunk.orig/libavcodec/imgconvert.c 2007-12-09 20:53:01.000000000 +0100
-+++ trunk/libavcodec/imgconvert.c 2007-12-09 20:55:02.000000000 +0100
+--- ffmpeg.20080206.orig/libavcodec/imgconvert.c 2008-03-15 22:40:38.000000000 +0100
++++ ffmpeg.20080206/libavcodec/imgconvert.c 2008-03-15 23:09:24.000000000 +0100
@@ -2324,7 +2324,7 @@
}
#endif
@@ -25,16 +25,16 @@
/* XXX: always use linesize. Return -1 if not supported */
int img_convert(AVPicture *dst, int dst_pix_fmt,
const AVPicture *src, int src_pix_fmt,
-Index: trunk/Makefile
+Index: ffmpeg.20080206/Makefile
===================================================================
---- trunk.orig/Makefile 2007-12-09 20:54:54.000000000 +0100
-+++ trunk/Makefile 2007-12-09 20:55:02.000000000 +0100
-@@ -289,15 +289,6 @@
- seektest: tests/seek_test$(EXESUF)
- $(SRC_PATH)/tests/seek_test.sh $(SEEK_REFFILE)
+--- ffmpeg.20080206.orig/Makefile 2008-03-15 23:03:24.000000000 +0100
++++ ffmpeg.20080206/Makefile 2008-03-15 23:10:13.000000000 +0100
+@@ -402,15 +402,6 @@
+ @echo
+ $(SRC_PATH)/tests/server-regression.sh $(FFSERVER_REFFILE) $(SRC_PATH)/tests/test.conf
-ifeq ($(CONFIG_SWSCALER),yes)
--test-server codectest mpeg4 mpeg ac3 snow snowll libavtest: swscale_error
+-test-server codectest $(CODEC_TESTS) libavtest: swscale_error
-swscale_error:
- @echo
- @echo "This regression test is incompatible with --enable-swscaler."
Modified: experimental/ffmpeg.20080206/debian/patches/020_disable_snow_mmx_in_pic.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg.20080206/debian/patches/020_disable_snow_mmx_in_pic.diff?rev=1074&op=diff
==============================================================================
--- experimental/ffmpeg.20080206/debian/patches/020_disable_snow_mmx_in_pic.diff (original)
+++ experimental/ffmpeg.20080206/debian/patches/020_disable_snow_mmx_in_pic.diff Sun Mar 16 08:48:04 2008
@@ -1,8 +1,8 @@
-Index: trunk/libavcodec/i386/dsputil_mmx.c
+Index: ffmpeg.20080206/libavcodec/i386/dsputil_mmx.c
===================================================================
---- trunk.orig/libavcodec/i386/dsputil_mmx.c 2007-10-25 14:59:01.000000000 +0200
-+++ trunk/libavcodec/i386/dsputil_mmx.c 2007-10-25 15:53:59.000000000 +0200
-@@ -3743,7 +3743,7 @@
+--- ffmpeg.20080206.orig/libavcodec/i386/dsputil_mmx.c 2008-02-05 12:22:55.000000000 +0100
++++ ffmpeg.20080206/libavcodec/i386/dsputil_mmx.c 2008-03-15 23:11:38.000000000 +0100
+@@ -3562,7 +3562,7 @@
#endif
#endif
@@ -11,10 +11,10 @@
if(mm_flags & MM_SSE2 & 0){
c->horizontal_compose97i = ff_snow_horizontal_compose97i_sse2;
#ifdef HAVE_7REGS
-Index: trunk/libavcodec/i386/snowdsp_mmx.c
+Index: ffmpeg.20080206/libavcodec/i386/snowdsp_mmx.c
===================================================================
---- trunk.orig/libavcodec/i386/snowdsp_mmx.c 2007-10-25 14:59:01.000000000 +0200
-+++ trunk/libavcodec/i386/snowdsp_mmx.c 2007-10-25 16:04:38.000000000 +0200
+--- ffmpeg.20080206.orig/libavcodec/i386/snowdsp_mmx.c 2007-08-30 13:41:58.000000000 +0200
++++ ffmpeg.20080206/libavcodec/i386/snowdsp_mmx.c 2008-03-15 23:11:38.000000000 +0100
@@ -23,6 +23,7 @@
#include "snow.h"
#include "x86_cpu.h"
Modified: experimental/ffmpeg.20080206/debian/patches/020_fix_libswscale_pic_code
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg.20080206/debian/patches/020_fix_libswscale_pic_code?rev=1074&op=diff
==============================================================================
--- experimental/ffmpeg.20080206/debian/patches/020_fix_libswscale_pic_code (original)
+++ experimental/ffmpeg.20080206/debian/patches/020_fix_libswscale_pic_code Sun Mar 16 08:48:04 2008
@@ -1,7 +1,7 @@
-Index: trunk/libswscale/swscale.c
+Index: ffmpeg.20080206/libswscale/swscale.c
===================================================================
---- trunk.orig/libswscale/swscale.c 2007-10-25 14:59:06.000000000 +0200
-+++ trunk/libswscale/swscale.c 2007-10-25 16:05:36.000000000 +0200
+--- ffmpeg.20080206.orig/libswscale/swscale.c 2008-01-29 15:58:10.000000000 +0100
++++ ffmpeg.20080206/libswscale/swscale.c 2008-03-15 23:11:50.000000000 +0100
@@ -1357,7 +1357,7 @@
return 0;
}
Modified: experimental/ffmpeg.20080206/debian/patches/020_mmx_optims.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg.20080206/debian/patches/020_mmx_optims.diff?rev=1074&op=diff
==============================================================================
--- experimental/ffmpeg.20080206/debian/patches/020_mmx_optims.diff (original)
+++ experimental/ffmpeg.20080206/debian/patches/020_mmx_optims.diff Sun Mar 16 08:48:04 2008
@@ -1,8 +1,8 @@
-Index: trunk/libavcodec/Makefile
+Index: ffmpeg.20080206/libavcodec/Makefile
===================================================================
---- trunk.orig/libavcodec/Makefile 2007-12-09 20:55:02.000000000 +0100
-+++ trunk/libavcodec/Makefile 2007-12-09 20:55:05.000000000 +0100
-@@ -353,6 +353,7 @@
+--- ffmpeg.20080206.orig/libavcodec/Makefile 2008-03-15 23:09:24.000000000 +0100
++++ ffmpeg.20080206/libavcodec/Makefile 2008-03-15 23:10:26.000000000 +0100
+@@ -366,6 +366,7 @@
i386/fft_3dn.o \
i386/fft_3dn2.o \
Modified: experimental/ffmpeg.20080206/debian/patches/020_mmx_pic_code.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg.20080206/debian/patches/020_mmx_pic_code.diff?rev=1074&op=diff
==============================================================================
--- experimental/ffmpeg.20080206/debian/patches/020_mmx_pic_code.diff (original)
+++ experimental/ffmpeg.20080206/debian/patches/020_mmx_pic_code.diff Sun Mar 16 08:48:04 2008
@@ -1,7 +1,7 @@
-Index: trunk/libavcodec/i386/mpegvideo_mmx_template.c
+Index: ffmpeg.20080206/libavcodec/i386/mpegvideo_mmx_template.c
===================================================================
---- trunk.orig/libavcodec/i386/mpegvideo_mmx_template.c 2007-10-25 15:49:30.000000000 +0200
-+++ trunk/libavcodec/i386/mpegvideo_mmx_template.c 2007-10-25 15:51:18.000000000 +0200
+--- ffmpeg.20080206.orig/libavcodec/i386/mpegvideo_mmx_template.c 2007-06-12 20:50:50.000000000 +0200
++++ ffmpeg.20080206/libavcodec/i386/mpegvideo_mmx_template.c 2008-03-15 23:10:34.000000000 +0100
@@ -154,7 +154,12 @@
SPREADW(MM"3")
"pxor "MM"7, "MM"7 \n\t" // 0
@@ -57,10 +57,10 @@
"r" (inv_zigzag_direct16+64), "r" (temp_block+64)
);
}
-Index: trunk/libpostproc/postprocess_template.c
+Index: ffmpeg.20080206/libpostproc/postprocess_template.c
===================================================================
---- trunk.orig/libpostproc/postprocess_template.c 2007-10-25 15:49:30.000000000 +0200
-+++ trunk/libpostproc/postprocess_template.c 2007-10-25 15:50:05.000000000 +0200
+--- ffmpeg.20080206.orig/libpostproc/postprocess_template.c 2008-02-02 22:24:54.000000000 +0100
++++ ffmpeg.20080206/libpostproc/postprocess_template.c 2008-03-15 23:10:34.000000000 +0100
@@ -35,9 +35,11 @@
# define ALIGN_MASK "$0xFFFFFFFFFFFFFFF8"
#else
Modified: experimental/ffmpeg.20080206/debian/patches/054_h264_mmx_chroma_mc_crash.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg.20080206/debian/patches/054_h264_mmx_chroma_mc_crash.diff?rev=1074&op=diff
==============================================================================
--- experimental/ffmpeg.20080206/debian/patches/054_h264_mmx_chroma_mc_crash.diff (original)
+++ experimental/ffmpeg.20080206/debian/patches/054_h264_mmx_chroma_mc_crash.diff Sun Mar 16 08:48:04 2008
@@ -1,8 +1,8 @@
-Index: trunk/libavcodec/h264.c
+Index: ffmpeg.20080206/libavcodec/h264.c
===================================================================
---- trunk.orig/libavcodec/h264.c 2007-12-09 20:53:00.000000000 +0100
-+++ trunk/libavcodec/h264.c 2007-12-09 20:55:19.000000000 +0100
-@@ -1713,8 +1713,8 @@
+--- ffmpeg.20080206.orig/libavcodec/h264.c 2008-03-15 22:40:38.000000000 +0100
++++ ffmpeg.20080206/libavcodec/h264.c 2008-03-15 23:11:58.000000000 +0100
+@@ -1694,8 +1694,8 @@
if( full_mx < 0-extra_width
|| full_my < 0-extra_height
Modified: experimental/ffmpeg.20080206/debian/patches/300_c++_compliant_headers.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg.20080206/debian/patches/300_c%2B%2B_compliant_headers.diff?rev=1074&op=diff
==============================================================================
--- experimental/ffmpeg.20080206/debian/patches/300_c++_compliant_headers.diff (original)
+++ experimental/ffmpeg.20080206/debian/patches/300_c++_compliant_headers.diff Sun Mar 16 08:48:04 2008
@@ -1,7 +1,7 @@
-Index: trunk/libavcodec/avcodec.h
+Index: ffmpeg.20080206/libavcodec/avcodec.h
===================================================================
---- trunk.orig/libavcodec/avcodec.h 2007-12-09 20:53:00.000000000 +0100
-+++ trunk/libavcodec/avcodec.h 2007-12-09 20:55:22.000000000 +0100
+--- ffmpeg.20080206.orig/libavcodec/avcodec.h 2008-03-15 22:59:25.000000000 +0100
++++ ffmpeg.20080206/libavcodec/avcodec.h 2008-03-15 23:12:06.000000000 +0100
@@ -30,6 +30,14 @@
#include "avutil.h"
#include <sys/types.h> /* size_t */
More information about the pkg-multimedia-commits
mailing list