[SCM] ffmpeg/ubuntu: Merge 'origin/master' into ubuntu
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Oct 2 17:31:38 UTC 2011
update debian/changelog
Drop all post 0.7.1 patches
Merge commit 'upstream/0.7.2'
Imported Upstream version 0.7.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/ubuntu
X-Git-Reftype: branch
X-Git-Oldrev: ea5101978bf233388f80c3cee4e382f36d769a79
X-Git-Newrev: 136d6c2e4c8b30e4507b1938af142d56812986de
The following commit has been merged in the ubuntu branch:
commit 58aee0090e2fc6bae29dd52f767946b3ce3099c5
Merge: ea5101978bf233388f80c3cee4e382f36d769a79 0d3ff4f2420566e084b4a1465959fbf67ebe81a5
Author: Reinhard Tartler <siretart at tauware.de>
Date: Sat Oct 1 00:19:52 2011 +0200
Merge 'origin/master' into ubuntu
Conflicts:
debian/changelog
debian/patches/series
diff --combined debian/changelog
index e502219,6785d1a..8006126
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,12 +1,30 @@@
+ libav (4:0.7.2-1) unstable; urgency=low
+
+ * New upstream release: 0.7.2
+ - Security focused release
+ - Includes Matroska reallocation checks, Closes: #643859
+ * Drop all post 0.7.1 patches, included upstream.
+
+ -- Reinhard Tartler <siretart at tauware.de> Fri, 30 Sep 2011 21:01:25 +0200
+
+libav (4:0.7.1-7ubuntu2) oneiric; urgency=low
+
+ * Revert "Convert package to include multiarch support."
+
+ -- Reinhard Tartler <siretart at tauware.de> Wed, 28 Sep 2011 09:18:34 +0200
+
+libav (4:0.7.1-7ubuntu1) oneiric; urgency=medium
+
+ * Merge from debian/unstable
+ - don't build against libfaad, libdirac, librtmp and libopenjpeg,
+ lame, xvid, x264 (all in universe)
+ - Introduces Security fix for CVE-2011-3362
+ - Fixes LP: #835903
+ * post-0.7.1/0070-Fix-memory-re-allocation-in-matroskadec.c-related-to.patch:
+ - fix memory (re)allocation in matroskadec.c, related to MSVR-11-0080
+
+ -- Reinhard Tartler <siretart at tauware.de> Tue, 27 Sep 2011 22:05:55 +0200
+
libav (4:0.7.1-7) unstable; urgency=medium
* Add 63 (!) additional post 0.7.1 patches
@@@ -45,15 -36,6 +54,15 @@@ libav (4:0.7.1-4) unstable; urgency=lo
* upload to unstable
-- Reinhard Tartler <siretart at tauware.de> Thu, 01 Sep 2011 22:45:43 +0200
+
+libav (4:0.7.1-3ubuntu1) oneiric; urgency=low
+
+ * Merge from debian/unstable
+ - don't build against libfaad, libdirac, librtmp and libopenjpeg,
+ lame, xvid, x264 (all in universe)
+ * Drop extra conflicts on libswscale-extra-1
+
+ -- Reinhard Tartler <siretart at tauware.de> Fri, 26 Aug 2011 11:12:43 +0200
libav (4:0.7.1-3) experimental; urgency=low
@@@ -75,28 -57,6 +84,28 @@@ libav (4:0.7.1-2) experimental; urgency
-- Reinhard Tartler <siretart at tauware.de> Tue, 26 Jul 2011 21:58:18 +0200
+libav (4:0.7.1-1ubuntu3) oneiric; urgency=low
+
+ * libswscale-dev: fix alternate on libswscale-extra-2, Fixes LP: #829857
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 20 Aug 2011 19:29:21 +0200
+
+libav (4:0.7.1-1ubuntu2) oneiric; urgency=low
+
+ * relax dependencies in the shlibs file to accomodate the new versioning
+ scheme in libav-extra. Fixes LP: #818619
+
+ -- Reinhard Tartler <siretart at tauware.de> Mon, 01 Aug 2011 13:16:59 +0200
+
+libav (4:0.7.1-1ubuntu1) oneiric; urgency=low
+
+ * Merge from debian/unstable
+ - don't build against libfaad, libdirac, librtmp and libopenjpeg
+ (all in universe)
+ - Extra conflicts on libswscale-extra-1 (can be dropped after natty release)
+
+ -- Reinhard Tartler <siretart at tauware.de> Thu, 21 Jul 2011 21:12:27 +0200
+
libav (4:0.7.1-1) experimental; urgency=low
[ Andres Mejia ]
@@@ -124,20 -84,6 +133,20 @@@ libav (4:0.7-2) experimental; urgency=l
-- Reinhard Tartler <siretart at tauware.de> Sat, 16 Jul 2011 14:38:21 +0200
+libav (4:0.7-1ubuntu2) oneiric; urgency=low
+
+ * Conflicts/Replaces against broken libswscale-extra-1 package, LP: #804452
+
+ -- Reinhard Tartler <siretart at tauware.de> Wed, 06 Jul 2011 15:29:06 +0200
+
+libav (4:0.7-1ubuntu1) oneiric; urgency=low
+
+ * Merge from debian. Remaining changes:
+ - don't build against libfaad, libdirac, librtmp and libopenjpeg
+ (all in universe)
+
+ -- Reinhard Tartler <siretart at tauware.de> Wed, 22 Jun 2011 10:47:22 +0200
+
libav (4:0.7-1) experimental; urgency=low
* New upstream release.
@@@ -150,14 -96,6 +159,14 @@@
-- Reinhard Tartler <siretart at tauware.de> Tue, 21 Jun 2011 07:49:59 +0200
+libav (4:0.7~rc1-1ubuntu1) oneiric; urgency=low
+
+ * Merge from debian. Remaining changes:
+ - don't build against libfaad, libdirac, librtmp and libopenjpeg
+ (all in universe)
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 18 Jun 2011 15:43:30 +0200
+
libav (4:0.7~rc1-1) experimental; urgency=low
* New upstream version
@@@ -167,14 -105,6 +176,14 @@@
-- Reinhard Tartler <siretart at tauware.de> Tue, 14 Jun 2011 22:03:36 +0200
+libav (4:0.7~beta2-2ubuntu1) oneiric; urgency=low
+
+ * Merge from debian. Remaining changes:
+ - don't build against libfaad, libdirac, librtmp and libopenjpeg
+ (all in universe)
+
+ -- Reinhard Tartler <siretart at tauware.de> Fri, 27 May 2011 19:27:07 +0200
+
libav (4:0.7~beta2-2) experimental; urgency=low
* refresh patches
@@@ -207,20 -137,6 +216,20 @@@ libav (4:0.7~b1-2) experimental; urgenc
-- Reinhard Tartler <siretart at tauware.de> Sun, 01 May 2011 18:58:40 +0200
+libav (4:0.7~b1-1ubuntu1) oneiric; urgency=low
+
+ * Merge from debian. Remaining changes:
+ - don't build against libfaad, libdirac, librtmp and libopenjpeg
+ (all in universe)
+ - explicitly --enable-pic on powerpc, cf. LP #654666
+ - different arm configure bits that should probably better be
+ merged into debian
+ * Cherry-picked from git:
+ - install doc/APIChanges and refer to them in NEWS.Debian (Closes: #623682)
+ - don't try to install non-existing documentation, fixes FTBFS on powerpc
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 30 Apr 2011 14:27:42 +0200
+
libav (4:0.7~b1-1) experimental; urgency=low
* New upstream version
@@@ -234,17 -150,6 +243,17 @@@
-- Reinhard Tartler <siretart at tauware.de> Tue, 19 Apr 2011 15:04:55 +0200
+libav (4:0.6.2-1ubuntu1) natty; urgency=low
+
+ * Merge from debian. Remaining changes:
+ - don't build against libfaad, libdirac, librtmp and libopenjpeg
+ (all in universe)
+ - explicitly --enable-pic on powerpc, cf. LP #654666
+ - different arm configure bits that should probably better be
+ merged into debian
+
+ -- Reinhard Tartler <siretart at tauware.de> Sun, 20 Mar 2011 12:09:31 +0100
+
libav (4:0.6.2-1) unstable; urgency=medium
[ Reinhard Tartler ]
@@@ -263,25 -168,6 +272,25 @@@
-- Reinhard Tartler <siretart at tauware.de> Sat, 19 Mar 2011 08:13:46 +0100
+ffmpeg (4:0.6.1-5ubuntu2) natty; urgency=low
+
+ * Replace cp with tar to avoid an error of
+ "/bin/cp: Argument list too long" on the ARM platform
+ (running under a QEMU chroot environment) (LP: #734331)
+ - Check on a Ubuntu "pbuilder" environment on Ubuntu 10.10/maverick x86
+ - Restore a "Doxygen" file that excidentaly got into the changeset of the bug
+
+ -- Gal Shalif <gal at shalif.com> Mon, 14 Mar 2011 13:47:24 +0200
+
+ffmpeg (4:0.6.1-5ubuntu1) natty; urgency=low
+
+ * Merge from debian. Remaining changes:
+ - don't build against libfaad, libdirac, librtmp and libopenjpeg (all in universe)
+ - explicitly --enable-pic on powerpc, cf. LP #654666
+ - different arm configure bits that should probably better be merged into debian
+
+ -- Reinhard Tartler <siretart at tauware.de> Sun, 13 Feb 2011 20:04:06 +0100
+
ffmpeg (4:0.6.1-5) unstable; urgency=low
* don't enable vaapi support on the hurd, Closes: #613034
@@@ -310,13 -196,6 +319,13 @@@ ffmpeg (4:0.6.1-3) unstable; urgency=lo
-- Reinhard Tartler <siretart at tauware.de> Sun, 30 Jan 2011 09:22:11 +0100
+ffmpeg (4:0.6.1-2ubuntu1) natty; urgency=low
+
+ * Merge from debian. Remaining changes:
+ - don't build against libfaad, libdirac, librtmp and libopenjpeg (all in universe)
+
+ -- Reinhard Tartler <siretart at tauware.de> Fri, 19 Nov 2010 12:05:43 +0100
+
ffmpeg (4:0.6.1-2) experimental; urgency=low
[ Jonas Smedegaard ]
@@@ -330,15 -209,6 +339,15 @@@
-- Reinhard Tartler <siretart at tauware.de> Fri, 19 Nov 2010 10:50:51 +0100
+ffmpeg (4:0.6.1-1ubuntu1) natty; urgency=low
+
+ * Merge from debian. Remaining changes:
+ - don't build against libfaad, libdirac, librtmp and libopenjpeg (all in universe)
+ - explicitly --enable-pic on powerpc, cf. LP: #654666
+ * remove fix-CVE-2010-3429.patch, applied upstream
+
+ -- Reinhard Tartler <siretart at tauware.de> Sun, 14 Nov 2010 12:19:50 +0100
+
ffmpeg (4:0.6.1-1) experimental; urgency=low
* Imported Upstream version 0.6.1
@@@ -348,44 -218,6 +357,44 @@@
-- Reinhard Tartler <siretart at tauware.de> Mon, 01 Nov 2010 09:18:08 +0100
+ffmpeg (4:0.6-2ubuntu6) maverick; urgency=low
+
+ * fix dependency on libswscale-extra-0, LP: #637895
+
+ -- Reinhard Tartler <siretart at tauware.de> Tue, 05 Oct 2010 21:25:53 +0200
+
+ffmpeg (4:0.6-2ubuntu5) maverick; urgency=low
+
+ * Add flic video patch. Fixes CVE-2010-3429
+
+ -- Reinhard Tartler <siretart at tauware.de> Tue, 05 Oct 2010 21:11:41 +0200
+
+ffmpeg (4:0.6-2ubuntu4) maverick; urgency=low
+
+ * Configure with --enable-pic on powerpc. LP: #654666.
+
+ -- Matthias Klose <doko at ubuntu.com> Mon, 04 Oct 2010 19:39:46 +0200
+
+ffmpeg (4:0.6-2ubuntu3) maverick; urgency=low
+
+ * add libxfixes-dev to build-depends, LP: #631103
+
+ -- Dominic Evans <oldmanuk at gmail.com> Fri, 10 Sep 2010 14:21:23 +0100
+
+ffmpeg (4:0.6-2ubuntu2) maverick; urgency=low
+
+ * weaken the dependencies for the -extra package
+
+ -- Reinhard Tartler <siretart at tauware.de> Sun, 11 Jul 2010 20:38:27 -0400
+
+ffmpeg (4:0.6-2ubuntu1) maverick; urgency=low
+
+ * merge from debian/experimental. remaining changes:
+ - don't disable encoders
+ - don't build against libfaad, libdirac, librtmp and libopenjpeg (all in universe)
+
+ -- Reinhard Tartler <siretart at tauware.de> Sun, 11 Jul 2010 11:00:54 -0400
+
ffmpeg (4:0.6-2) experimental; urgency=low
[ Fabian Greffrath ]
@@@ -411,18 -243,6 +420,18 @@@
-- Reinhard Tartler <siretart at tauware.de> Tue, 29 Jun 2010 09:07:56 +0200
+ffmpeg (4:0.6-1ubuntu1) maverick; urgency=low
+
+ * merge from debian/experimental. remaining changes:
+ - don't disable encoders
+ - don't build against libfaad, libdirac and libopenjpeg (all in universe)
+ * new upstream release
+ - internal vorbis encoder is disabled. LP: #585330
+ - includes native AMR-NB decoder, LP: #93849
+ - api-example is fixed: LP: #557319
+
+ -- Reinhard Tartler <siretart at tauware.de> Wed, 16 Jun 2010 12:53:24 +0200
+
ffmpeg (4:0.6-1) experimental; urgency=low
* new upstream release
@@@ -432,21 -252,6 +441,21 @@@
-- Reinhard Tartler <siretart at tauware.de> Wed, 16 Jun 2010 09:25:28 +0200
+ffmpeg (4:0.6~svn20100505-1ubuntu2) maverick; urgency=low
+
+ * add proper replaces, fixes: LP: #587369
+ * fix typo in dependency on libavfilter-extra-1. LP: #587431
+
+ -- Reinhard Tartler <siretart at tauware.de> Thu, 03 Jun 2010 11:33:32 +0200
+
+ffmpeg (4:0.6~svn20100505-1ubuntu1) maverick; urgency=low
+
+ * merge from debian/experimental. remaining changes:
+ - don't disable encoders
+ - don't build against libfaad, libdirac and libopenjpeg (all in universe)
+
+ -- Reinhard Tartler <siretart at tauware.de> Wed, 26 May 2010 00:01:17 +0200
+
ffmpeg (4:0.6~svn20100505-1) experimental; urgency=low
* update to new upstream. Closes: #569727
@@@ -541,14 -346,6 +550,14 @@@ ffmpeg (4:0.5.1-2) unstable; urgency=lo
-- Reinhard Tartler <siretart at tauware.de> Wed, 10 Mar 2010 21:19:40 +0100
+ffmpeg (4:0.5.1-1ubuntu1) lucid; urgency=low
+
+ * merge from debian. remaining changes:
+ - don't disable encoders
+ - don't build against libfaad, libdirac and libopenjpeg (all in universe)
+
+ -- Reinhard Tartler <siretart at tauware.de> Thu, 04 Mar 2010 10:34:37 +0100
+
ffmpeg (4:0.5.1-1) unstable; urgency=low
* new upstream release:
@@@ -579,25 -376,6 +588,25 @@@ ffmpeg (4:0.5+svn20090706-6) unstable;
-- Reinhard Tartler <siretart at tauware.de> Sun, 31 Jan 2010 16:53:47 +0100
+ffmpeg (4:0.5+svn20090706-5ubuntu2) lucid; urgency=low
+
+ * tighten build dependency on new x264 package
+ * add x264 backport for ffmpeg 0.5
+ * install presets in 'libavcodec package' instead of 'ffmpeg' binary,
+ see git history for rationale of this change
+
+ -- Reinhard Tartler <siretart at tauware.de> Wed, 17 Feb 2010 08:37:17 +0100
+
+ffmpeg (4:0.5+svn20090706-5ubuntu1) lucid; urgency=low
+
+ * merge from debian, remaining changes:
+ - dont disable internal encoders
+ - disabled extra depedencies (come with ffmpeg-extra)
+ - libdirac
+ - libopenjpeg
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 16 Jan 2010 10:12:15 +0100
+
ffmpeg (4:0.5+svn20090706-5) unstable; urgency=medium
* Upload to unstable
@@@ -624,7 -402,10 +633,7 @@@ ffmpeg (4:0.5+svn20090706-4) experiment
--enable-armvfp on ARM since the upstream configure script will do the
right thing when the proper flags are set.
- [ Reinhard Tartler ]
- * build with PIC on powerpc (Closes: #561956)
-
- -- Reinhard Tartler <siretart at tauware.de> Fri, 15 Jan 2010 21:46:49 +0100
+ -- Loïc Minier <lool at dooz.org> Wed, 13 Jan 2010 12:57:32 +0100
ffmpeg (4:0.5+svn20090706-3) experimental; urgency=low
@@@ -669,73 -450,6 +678,73 @@@
* make sure the ${misc:Depends} substvar is used for each binary package
-- Reinhard Tartler <siretart at tauware.de> Wed, 06 Jan 2010 16:27:40 +0100
+
+ffmpeg (4:0.5+svn20090706-2ubuntu5~ppa2) lucid; urgency=low
+
+ * export *all* symbols of libswscale, fixes FTBFS in mplayer
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 02 Jan 2010 23:37:21 +0100
+
+ffmpeg (4:0.5+svn20090706-2ubuntu5~ppa1) lucid; urgency=low
+
+ * Imported Debian patch 0.5+svn20090706-2ubuntu4
+ * revert gbp.conf to point to lucid branch
+ * enable symbol versioning
+ * bump shlibs version
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 02 Jan 2010 15:03:09 +0100
+
+ffmpeg (4:0.5+svn20090706-2ubuntu4) lucid; urgency=low
+
+ * add build dependency on 'yasm', since it is now moved to main.
+
+ -- Reinhard Tartler <siretart at tauware.de> Mon, 21 Dec 2009 23:57:34 +0100
+
+ffmpeg (4:0.5+svn20090706-2ubuntu3) lucid; urgency=low
+
+ * security backports from ffmpeg trunk (Closes: #550442)
+ - libavcodec/mpegaudiodec
+ - libavcodec/vorbis_dec
+ - libavcodec/ffv1
+ - libavcodec/vp3
+ - libavcodec/h264
+ - libavformat/mov
+ - libavformat/oggdec
+ - libavformat/oggparsevorbis
+
+ -- Reinhard Tartler <siretart at tauware.de> Thu, 05 Nov 2009 20:31:29 +0100
+
+ffmpeg (4:0.5+svn20090706-2ubuntu2) karmic; urgency=low
+
+ [ Reinhard Tartler ]
+ * Make arguments of av_set_pts_info() unsigned.
+ * update debian/changelog
+ * use patch for issue1245 from git.ffmpeg.org
+ * Support constant-quant encoding for libtheora, LP: #356322
+ * increase swscale compile time width (VOF/VOFW), LP: #443264
+
+ [ Loïc Minier ]
+ * Update config for karmic's armel toolchain.
+ * Enable neon flavour; LP: #383240.
+ * Update NEON confflags to assume v7 and VFP.
+ * Add backported NEON patches from ffmpeg trunk; see debian/patches/neon/.
+ * Pass proper --cpu and --extra-flags on armel.
+ * Pass -fPIC -DPIC to neon pass.
+
+ -- Loïc Minier <loic.minier at ubuntu.com> Tue, 13 Oct 2009 23:56:04 +0200
+
+ffmpeg (4:0.5+svn20090706-2ubuntu1) karmic; urgency=low
+
+ * merge from debian. Remaining changes:
+ - disabled output decoders: faad, openjpeg, dirac (all not in main)
+ - build arm vfp variant
+ - don't build depend on yasm.
+ * fix dependencies on -extra packages: LP: #418705, #416348
+ * no need to remove mpeg encoders in the ubuntu package, unless we hear
+ otherwise from some patent owner. This brings back the mpeg2video
+ encoder is available. cf. formats.txt.gz LP: #416585
+
+ -- Reinhard Tartler <siretart at tauware.de> Wed, 26 Aug 2009 11:20:03 +0200
ffmpeg (4:0.5+svn20090706-2) unstable; urgency=low
@@@ -752,30 -466,6 +761,30 @@@
-- Reinhard Tartler <siretart at tauware.de> Wed, 26 Aug 2009 09:12:49 +0200
+ffmpeg (4:0.5+svn20090706-1ubuntu3) karmic; urgency=low
+
+ * update the dependencies of the -dev packages for the
+ unstripped -> extra renaming
+
+ -- Reinhard Tartler <siretart at tauware.de> Tue, 25 Aug 2009 16:37:23 +0200
+
+ffmpeg (4:0.5+svn20090706-1ubuntu2) karmic; urgency=low
+
+ * really drop libopenjpeg from build depends.
+
+ -- Reinhard Tartler <siretart at tauware.de> Tue, 25 Aug 2009 08:17:17 +0200
+
+ffmpeg (4:0.5+svn20090706-1ubuntu1) karmic; urgency=low
+
+ * merge from debian. Remaining changes:
+ - don't build-depend on libfaad-dev, disabling faad decoder.
+ - build arm vfp variant
+ - don't build libopenjpeg support (not in main)
+ * change shlibs file to make applications depend on the -extra- packages.
+ * don't build depend on yasm.
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 15 Aug 2009 18:18:23 +0200
+
ffmpeg (4:0.5+svn20090706-1) unstable; urgency=low
* preparing new upstream version, 0.5 release branch, rev 19352
@@@ -836,31 -526,6 +845,31 @@@ ffmpeg-debian (4:0.5+svn20090609-2) uns
-- Reinhard Tartler <siretart at tauware.de> Thu, 13 Aug 2009 12:46:46 +0200
+ffmpeg-debian (4:0.5+svn20090609-1ubuntu3) karmic; urgency=low
+
+ * do not forcefully enable objenjpeg, it is not avaiable in this build
+ anyway
+ * don't build against faac in any case, it is deemed non-free
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 25 Jul 2009 09:15:12 +0200
+
+ffmpeg-debian (4:0.5+svn20090609-1ubuntu2) karmic; urgency=low
+
+ * remove libopenjpeg-dev from build depends (fixes FTBFS)
+ * remove duplicate libxvmc-dev build-dependency
+
+ -- Reinhard Tartler <siretart at tauware.de> Fri, 24 Jul 2009 21:53:47 +0200
+
+ffmpeg-debian (4:0.5+svn20090609-1ubuntu1) karmic; urgency=low
+
+ * merge from debian. Remaining changes:
+ - don't build-depend on libfaad-dev, disabling faad decoder.
+ - build arm vfp variant
+ * update gbp.conf
+ * move gbp.conf to debian/
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 18 Jul 2009 10:55:24 +0200
+
ffmpeg-debian (4:0.5+svn20090609-1) unstable; urgency=low
[ Andres Mejia ]
@@@ -975,49 -640,6 +984,49 @@@ ffmpeg-debian (4:0.5+svn20090420-1) uns
-- Reinhard Tartler <siretart at tauware.de> Sat, 02 May 2009 09:09:54 +0200
+ffmpeg-debian (3:0.svn20090303-1ubuntu6) jaunty; urgency=low
+
+ * vfp CFLAGS: add "-mfpu=vfp -mfloat-abi=softfp".
+
+ -- Loic Minier <lool at dooz.org> Fri, 10 Apr 2009 21:34:29 +0200
+
+ffmpeg-debian (3:0.svn20090303-1ubuntu5) jaunty; urgency=low
+
+ * Disable more autodetected ARM arch features.
+ * Add neon and vfp flavors to armel disabled for now.
+ * Enable vfp pass on armel; leave the neon disabled.
+
+ -- Loïc Minier <lool at dooz.org> Fri, 10 Apr 2009 17:58:52 +0200
+
+ffmpeg-debian (3:0.svn20090303-1ubuntu4) jaunty; urgency=low
+
+ * brown paperbag upload. Actually include the patch intended for the
+ last upload.
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 21 Mar 2009 14:55:46 +0100
+
+ffmpeg-debian (3:0.svn20090303-1ubuntu3) jaunty; urgency=low
+
+ * don't disable ffserver in specialised flavors. Fixes LP: #345370
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 21 Mar 2009 14:52:25 +0100
+
+ffmpeg-debian (3:0.svn20090303-1ubuntu2) jaunty; urgency=low
+
+ * No-change rebuild to fix lpia shared library dependencies.
+
+ -- Colin Watson <cjwatson at ubuntu.com> Thu, 19 Mar 2009 17:26:36 +0000
+
+ffmpeg-debian (3:0.svn20090303-1ubuntu1) jaunty; urgency=low
+
+ * FFE granted in LP: #340303.
+
+ * merge from debian/unstable.
+ * remaining changes to debian:
+ - don't build-depend on libfaad-dev, disabling faad decoder.
+
+ -- Reinhard Tartler <siretart at tauware.de> Fri, 13 Mar 2009 08:54:33 +0100
+
ffmpeg-debian (3:0.svn20090303-1) unstable; urgency=low
* New Upstream Version (svn revision 17737 libswscale revision 28799)
@@@ -1056,13 -678,6 +1065,13 @@@ ffmpeg-debian (3:0.svn20090204-3) unsta
-- Reinhard Tartler <siretart at tauware.de> Sun, 22 Feb 2009 09:32:49 +0100
+ffmpeg-debian (3:0.svn20090204-2ubuntu1) jaunty; urgency=low
+
+ * merge from debian. Remaining changes:
+ - don't build depend on libfaad-dev
+
+ -- Reinhard Tartler <siretart at tauware.de> Thu, 05 Feb 2009 21:22:01 +0100
+
ffmpeg-debian (3:0.svn20090204-2) experimental; urgency=low
* add libxvmc-dev to build-depends in the 'ffmpeg' variant
@@@ -1113,13 -728,6 +1122,13 @@@ ffmpeg-debian (3:0.svn20090204-1) exper
-- Reinhard Tartler <siretart at tauware.de> Sun, 01 Feb 2009 19:54:27 +0100
+ffmpeg-debian (3:0.svn20090119-1ubuntu1) jaunty; urgency=low
+
+ * merge from debian. LP: #318501
+ * new version fixes CVE-2008-3230, LP: #253767
+
+ -- Reinhard Tartler <siretart at tauware.de> Tue, 20 Jan 2009 09:20:53 +0100
+
ffmpeg-debian (3:0.svn20090119-1) experimental; urgency=low
* New Upstream Version (svn revision 16681 libswscale revision 28341)
@@@ -1150,16 -758,6 +1159,16 @@@ ffmpeg-debian (3:0.svn20090110-1) exper
-- Reinhard Tartler <siretart at tauware.de> Sun, 11 Jan 2009 20:55:48 +0100
+ffmpeg-debian (3:0.svn20081115-1ubuntu1) jaunty; urgency=low
+
+ * merge from debian.
+ * keep myself in the maintainer field. If you are touching this or the
+ 'ffmpeg' package in multiverse, please get in touch with me. Both
+ source packages come from the same packaging branch.
+ * drop dependency on faad.
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 15 Nov 2008 19:44:29 +0100
+
ffmpeg-debian (3:0.svn20081115-1) experimental; urgency=low
* new upstream svn snapshot (svn revision 15824, libswscale revision 27910)
@@@ -1169,31 -767,6 +1178,31 @@@
-- Reinhard Tartler <siretart at tauware.de> Mon, 10 Nov 2008 21:37:16 +0100
+ffmpeg-debian (3:0.svn20081108-1ubuntu3) jaunty; urgency=low
+
+ * really disable faad support completely.
+
+ -- Reinhard Tartler <siretart at tauware.de> Mon, 10 Nov 2008 10:58:01 +0100
+
+ffmpeg-debian (3:0.svn20081108-1ubuntu2) jaunty; urgency=low
+
+ * drop the patch to dlopen faad at runtime for now. it needs more
+ polishing, and we can have that functionality easier with the 'ffmpeg'
+ source package that will appear in multiverse.
+
+ -- Reinhard Tartler <siretart at tauware.de> Mon, 10 Nov 2008 10:31:47 +0100
+
+ffmpeg-debian (3:0.svn20081108-1ubuntu1) jaunty; urgency=low
+
+ * merge from debian.
+ * keep myself in the maintainer field. If you are touching this or the
+ 'ffmpeg' package in multiverse, please get in touch with me. Both
+ source packages come from the same packaging branch.
+ * drop dependency on faad.
+ * import patches from old packaging to dlopen libfaad at runtime.
+
+ -- Reinhard Tartler <siretart at tauware.de> Mon, 10 Nov 2008 07:31:16 +0100
+
ffmpeg-debian (3:0.svn20081108-1) experimental; urgency=low
* upstream svn snapshot (svn revision 15786, libswscale revision 27900).
diff --combined debian/patches/series
index f16bfac,e3f4b76..b5442d8
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,73 -1,3 +1,2 @@@
- post-0.7.1/0001-riff-Add-mpgv-MPEG-2-fourcc.patch
- post-0.7.1/0002-jpegdec-actually-search-for-and-parse-RSTn.patch
- post-0.7.1/0003-cavs-fix-some-crashes-with-invalid-bitstreams.patch
- post-0.7.1/0004-configure-add-missing-CFLAGS-to-fix-building-on-the-.patch
- post-0.7.1/0005-postprocess.c-filter-name-needs-to-be-double-0-termi.patch
- post-0.7.1/0006-swscale-don-t-use-planar-output-functions-to-write-t.patch
- post-0.7.1/0007-H.264-fix-overreads-of-qscale_table.patch
- post-0.7.1/0008-dca-set-AVCodecContext-frame_size-for-DTS-audio.patch
- post-0.7.1/0009-mxfenc-fix-ignored-drop-flag-in-binary-timecode-repr.patch
- post-0.7.1/0010-ARM-workaround-for-bug-in-GNU-assembler.patch
- post-0.7.1/0011-eval-fix-memleak.patch
- post-0.7.1/0012-adts-Fix-PCE-copying.patch
- post-0.7.1/0013-Revert-ffmpeg-get-rid-of-useless-AVInputStream.nb_st.patch
- post-0.7.1/0014-gxf-Fix-25-fps-DV-material-in-GXF-being-misdetected-.patch
- post-0.7.1/0015-alsa-fallback-to-buffer_size-4-for-period_size.patch
- post-0.7.1/0016-alsa-limit-buffer_size-to-32768-frames.patch
- post-0.7.1/0017-mpegts-fix-Continuity-Counter-error-detection.patch
- post-0.7.1/0018-pix_fmt-Fix-number-of-bits-per-component-in-yuv444p9.patch
- post-0.7.1/0019-lavf-fix-segfault-in-av_open_input_stream.patch
- post-0.7.1/0020-aacps-skip-some-memcpy-if-src-and-dst-would-be-equal.patch
- post-0.7.1/0021-Do-not-decode-RV30-files-if-the-extradata-is-too-sma.patch
- post-0.7.1/0022-Fix-incorrect-max_lowres-values.patch
- post-0.7.1/0023-rv30-return-AVERROR-EINVAL-instead-of-EINVAL.patch
- post-0.7.1/0024-vp3-theora-flush-after-seek.patch
- post-0.7.1/0025-mxfdec-Include-FF_INPUT_BUFFER_PADDING_SIZE-when-all.patch
- post-0.7.1/0026-aac-Remove-some-suspicious-illegal-memcpy-s-from-LTP.patch
- post-0.7.1/0027-libx264-do-not-set-pic-quality-if-no-frame-is-output.patch
- post-0.7.1/0028-Remove-incorrect-info-in-documentation-of-AVCodecCon.patch
- post-0.7.1/0029-h264-notice-memory-allocation-failure.patch
- post-0.7.1/0030-VC-1-fix-reading-of-custom-PAR.patch
- post-0.7.1/0031-flvenc-use-int64_t-to-store-offsets.patch
- post-0.7.1/0032-rv10-20-tell-decoder-to-use-edge-emulation.patch
- post-0.7.1/0033-aac-Only-output-configure-if-audio-was-found.patch
- post-0.7.1/0034-h264-correct-the-check-for-invalid-long-term-frame-i.patch
- post-0.7.1/0035-h264-correct-implicit-weight-table-computation-for-l.patch
- post-0.7.1/0036-h264-fix-PCM-intra-coded-blocks-in-monochrome-case.patch
- post-0.7.1/0037-vc1-properly-zero-coded_block-edges-on-new-slice-ent.patch
- post-0.7.1/0038-VC1-Fix-first-last-row-checks-with-slices.patch
- post-0.7.1/0039-vf_scale-don-t-leak-SWS-context.patch
- post-0.7.1/0040-cpu-detection-avoid-a-signed-overflow.patch
- post-0.7.1/0041-AVOptions-fix-av_set_string3-doxy-to-match-reality.patch
- post-0.7.1/0042-lavc-fix-type-for-thread_type-option.patch
- post-0.7.1/0043-Fixed-invalid-access-in-wavpack-decoder-on-corrupted.patch
- post-0.7.1/0044-Fixed-invalid-writes-in-wavpack-decoder-on-corrupted.patch
- post-0.7.1/0045-Fixed-invalid-access-in-wavpack-decoder-on-corrupted.patch
- post-0.7.1/0046-wavpack-Check-error-codes-rather-than-working-around.patch
- post-0.7.1/0047-ffv1-Fixed-size-given-to-init_get_bits-in-decoder.patch
- post-0.7.1/0048-indeo2-init_get_bits-size-in-bits-instead-of-bytes.patch
- post-0.7.1/0049-indeo2-fail-if-input-buffer-too-small.patch
- post-0.7.1/0050-cljr-init_get_bits-size-in-bits-instead-of-bytes.patch
- post-0.7.1/0051-Fixed-segfault-with-wavpack-decoder-on-corrupted-dec.patch
- post-0.7.1/0052-smacker-demuxer-handle-possible-av_realloc-failure.patch
- post-0.7.1/0053-Fixed-size-given-to-init_get_bits-in-xan-decoder.patch
- post-0.7.1/0054-xan-Add-some-buffer-checks.patch
- post-0.7.1/0055-ape-demuxer-fix-segfault-on-memory-allocation-failur.patch
- post-0.7.1/0056-Check-for-invalid-packet-size-in-the-smacker-demuxer.patch
- post-0.7.1/0057-Fixed-off-by-one-packet-size-allocation-in-the-smack.patch
- post-0.7.1/0058-Check-and-propagate-errors-when-VLC-trees-cannot-be-.patch
- post-0.7.1/0059-Check-for-invalid-VLC-value-in-smacker-decoder.patch
- post-0.7.1/0060-smacker-fix-a-few-off-by-1-errors.patch
- post-0.7.1/0061-Fixed-size-given-to-init_get_bits.patch
- post-0.7.1/0062-oggdec-fix-out-of-bound-write-in-the-ogg-demuxer.patch
- post-0.7.1/0063-lavf-Fix-context-pointer-in-av_open_input_stream-whe.patch
- post-0.7.1/0064-rv10-Reject-slices-that-does-not-have-the-same-type-.patch
- post-0.7.1/0065-rv34-Avoid-NULL-dereference-on-corrupted-bitstream.patch
- post-0.7.1/0066-rv34-Fix-potential-overreads.patch
- post-0.7.1/0067-rv34-Check-for-invalid-slice-offsets.patch
- post-0.7.1/0068-ppc-fix-32-bit-PIC-build.patch
- post-0.7.1/0069-ppc-fix-some-pointer-to-integer-casts.patch
- post-0.7.1/0070-Fix-memory-re-allocation-in-matroskadec.c-related-to.patch
--
01-Tweak-doxygen-config.patch
02-make-MAP_ANONYMOUS_AVAILABLE.patch
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list