[SCM] FFmpeg packaging branch, ubuntu.karmic, updated. debian/0.5+svn20090706-1ubuntu3-22-g5aef7d4

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Tue Oct 13 21:26:19 UTC 2009


The following commit has been merged in the ubuntu.karmic branch:
commit 5aef7d42fdac6e8bb795d52d855db853c826554d
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Oct 13 23:10:02 2009 +0200

    increase swscale compile time width (VOF/VOFW), LP: #443264

diff --git a/debian/patches/increase-VOFW-on-x86.patch b/debian/patches/increase-VOFW-on-x86.patch
new file mode 100644
index 0000000..df5800b
--- /dev/null
+++ b/debian/patches/increase-VOFW-on-x86.patch
@@ -0,0 +1,30 @@
+From: michael <michael at b3059339-0415-0410-9bf9-f77b7e298cf2>
+Date: Tue, 5 May 2009 01:34:16 +0000 (+0000)
+Subject: Change VOFW for x86 to 5120, it allows larger images to be scaled and was
+X-Git-Url: http://git.ffmpeg.org/?p=libswscale;a=commitdiff_plain;h=c9d08ac2f27b3c7a18db9d2ef417673f77be405f
+
+Change VOFW for x86 to 5120, it allows larger images to be scaled and was
+not slower. Other archs are not changed as the larger VOFW was slower on PPC.
+
+
+git-svn-id: file:///var/local/repositories/mplayer/trunk/libswscale@29256 b3059339-0415-0410-9bf9-f77b7e298cf2
+---
+
+diff --git a/swscale_internal.h b/swscale_internal.h
+index 3995887..eb11166 100644
+--- a/libswscale/swscale_internal.h
++++ b/libswscale/swscale_internal.h
+@@ -33,7 +33,12 @@
+ 
+ #define MAX_FILTER_SIZE 256
+ 
+-#define VOFW 2048
++#if ARCH_X86
++#define VOFW 5120
++#else
++#define VOFW 2048 // faster on PPC and not tested on others
++#endif
++
+ #define VOF  (VOFW*2)
+ 
+ #ifdef WORDS_BIGENDIAN
diff --git a/debian/patches/series b/debian/patches/series
index aa34878..352acfa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,6 +4,7 @@ fix-qtrle-encoding-when-previous-frame-linesize.patch
 aac-regression.patch
 fix-dv-seeking.patch
 fix-constant-quant-encoding.patch
+increase-VOFW-on-x86.patch
 issue1245.patch
 900_doxyfile
 # fpic-ftbfs-fix.patch

-- 
FFmpeg packaging



More information about the pkg-multimedia-commits mailing list