[SCM] FFmpeg packaging branch, ubuntu, updated. debian/0.6-1ubuntu1-28-g66ae34b

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jul 11 15:06:43 UTC 2010


The following commit has been merged in the ubuntu branch:
commit f9cc4286d02880d38c3d16c73bcfe9235308102a
Merge: b5b1638fc95c0ff0a35838e373488927a198047a 02efbd15cbb0fd543a08b1868a010d3a5bbe7ba3
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jul 11 11:00:21 2010 -0400

    Merge branch 'master.snapshot' into ubuntu
    
    Conflicts:
    	debian/changelog
    	debian/confflags
    	debian/control
    	debian/patches/0002-Tweak-doxygen-config.patch

diff --combined debian/changelog
index fd032a8,fcbbce5..3baff4f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,28 +1,40 @@@
+ ffmpeg (4:0.6-2) experimental; urgency=low
+ 
+   [ Fabian Greffrath ]
+   * Enable RTMP[E] support via librtmp.
+   * Disable aac encoder, see README.Debian.
+   * Fix obsolete-relation-form for the internal dependencies.
+   * Merge debian/README.Source into debian/README.source and add section
+     headers.
+   * Remove obsoleted support for the non-free libamr-nb/wb.
+ 
+   [ Reinhard Tartler ]
+   * enable runtime-cpudetect
+   * conditionally build against opencore-amr if installed in the build
+     environment
+   * update upstream url in debian/copyright
+   * fix usage documentation in debian/get-orig-source.sh
+   * update dep3 headers for debian/patches/900_doxyfile
+   * add proper replaces for moving presets back to ffmpeg
+   * make debian/patches gbp-pq friendly
+   * Add VP80 fourcc to libavformat/riff.c
+   * Backport-AAC-HE-v2
+   * bump Standards-Version, no changes needed
+ 
+  -- 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
@@@ -19,21 -32,6 +44,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
@@@ -51,63 -49,6 +76,63 @@@
  
   -- Reinhard Tartler <siretart at tauware.de>  Sun, 24 Jan 2010 21:24:56 +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:
 +    - clarifies documentation on metadata, Closes: #570050, LP: #501729
 +    - further security backports, Closes: #570713
 +  * adapt to new versioning scheme
 +  * use '<<' instead of '<' relationship for internal shlib file
 +  * merge changes from ubuntu packaging
 +  * drop wmapro backport again as discussed with upstream. The unrelated
 +    changes seem too risky for a stable release.
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Wed, 03 Mar 2010 22:28:24 +0100
 +
 +ffmpeg (4:0.5+svn20090706-6) unstable; urgency=low
 +
 +  [ Fabian Greffrath ]
 +  * debian/patches/901-fix-misc-typos.patch: New patch taken from
 +    upstream GIT (slightly modified) to fix some spelling errors.
 +  * Document our calling of debhelper programs in an odd order in
 +    debian/rules.
 +
 +  [ Reinhard Tartler ]
 +  * document some unattributed patches
 +  * enable cpu autodetection in libswscale, Closes: #567725, LP: #386397
 +
 +  [ Christopher Martin ]
 +  * backport wmapro codec from ffmpeg trunk
 +
 + -- 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
@@@ -134,7 -75,10 +159,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
  
@@@ -179,73 -123,6 +204,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
  
@@@ -262,30 -139,6 +287,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
@@@ -346,31 -199,6 +371,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 ]
@@@ -485,49 -313,6 +510,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)
@@@ -566,13 -351,6 +591,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
@@@ -623,13 -401,6 +648,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)
@@@ -660,16 -431,6 +685,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)
@@@ -679,31 -440,6 +704,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/confflags
index b8a5af5,94b6663..52742ba
--- a/debian/confflags
+++ b/debian/confflags
@@@ -75,6 -75,19 +75,6 @@@ gpl_confflags += --enable-x11gra
  # there is no libfaad in ubuntu/main, on in ubuntu/multiverse
  gpl_confflags += $(call cond_enable,/usr/include/faad.h,libfaad)
  
 -# "forbidden" encoders, see README.Debian for details
 -disable_encoders += --disable-encoder=aac
 -disable_encoders += --disable-encoder=h263
 -disable_encoders += --disable-encoder=h263p
 -disable_encoders += --disable-encoder=mpeg2video
 -disable_encoders += --disable-encoder=mpeg4
 -disable_encoders += --disable-encoder=msmpeg4v1
 -disable_encoders += --disable-encoder=msmpeg4v2
 -disable_encoders += --disable-encoder=msmpeg4v3
 -
 -# Comment out the following line to *not* disable the above encoders
 -confflags += $(disable_encoders)
 -
  # Common configuration flags
  confflags += --extra-version='$(DEB_VERSION)'
  confflags += --prefix=/usr
@@@ -82,11 -95,14 +82,13 @@@ confflags += --enable-avfilte
  confflags += --enable-avfilter-lavf
  confflags += --enable-vdpau
  confflags += --enable-bzlib
 -confflags += --enable-libdirac
  confflags += --enable-libgsm
 -confflags += --enable-libopenjpeg
  confflags += --enable-libschroedinger
  confflags += --enable-libspeex
  confflags += --enable-libtheora
  confflags += --enable-libvorbis
 -confflags += --enable-librtmp
++# only in ubuntu universe
++# confflags += --enable-librtmp
  confflags += --enable-vaapi
  confflags += --enable-pthreads
  confflags += --enable-zlib
@@@ -102,12 -118,8 +104,8 @@@ confflags += $(extra_common_confflags
  
  # this part below is intended for the 'ffmpeg' package in ubuntu/multiverse
  gpl_confflags += $(call cond_enable,/usr/include/xvid.h,libxvid)
- confflags += $(call cond_enable,/usr/include/lame/lame.h,libmp3lame)
  gpl_confflags += $(call cond_enable,/usr/include/x264.h,libx264)
- 
  confflags += $(call cond_enable,/usr/include/lame/lame.h,libmp3lame)
- confflags += $(call cond_enable_nf,/usr/include/amrnb/sp_dec.h,libamr-nb)
- confflags += $(call cond_enable_nf,/usr/include/amrwb/dec.h,libamr-wb)
  
  # Opencore-amr requires GPL v3
  v3_confflags += $(call cond_enable_v3,/usr/include/opencore-amrnb/interf_dec.h,libopencore-amrnb)
diff --combined debian/control
index cf4a608,42dc043..13949d3
--- a/debian/control
+++ b/debian/control
@@@ -1,15 -1,14 +1,15 @@@
  Source: ffmpeg
  Section: libs
  Priority: optional
 -Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 +Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss at lists.ubuntu.com>
 +XSBC-Original-Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
  Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>,
             Loic Minier <lool at dooz.org>,
             Reinhard Tartler <siretart at tauware.de>,
             Fabian Greffrath <fabian+debian at greffrath.com>,
             Andres Mejia <mcitadel at gmail.com>
  DM-Upload-Allowed: yes
- Standards-Version: 3.8.4
+ Standards-Version: 3.9.0
  Vcs-Git: git://git.debian.org/git/pkg-multimedia/ffmpeg.git
  Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/ffmpeg.git;a=summary
  Homepage: http://ffmpeg.org/
@@@ -18,10 -17,14 +18,11 @@@ Build-Depends: debhelper (>= 7)
                 libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
                 libbz2-dev,
                 libdc1394-22-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
                 libfreetype6-dev,
                 libgsm1-dev,
                 libimlib2-dev,
 -               libopenjpeg-dev,
                 libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+                librtmp-dev (>= 2.2e-4),
                 libschroedinger-dev,
                 libsdl1.2-dev,
                 libspeex-dev,
@@@ -42,7 -45,7 +43,7 @@@ Package: ffmpe
  Section: video
  Architecture: any
  Replaces: libavcodec52 (<< ${source:Version}),
-           libavcodec-extra-52 (<< 4:0.6~svn20100505-1ubuntu1)
+           libavcodec-extra-52 (<< 4:0.6~)
  Depends: ${shlibs:Depends},
           ${misc:Depends}
  Conflicts: ffprobe
@@@ -92,7 -95,6 +93,7 @@@ Package: libavcodec5
  Architecture: any
  Depends: ${shlibs:Depends},
           ${misc:Depends}
 +Replaces: ffmpeg (<< 4:0.5.1-1)
  Description: ffmpeg codec library
   This is the codec library from the ffmpeg project. It supports most existing
   encoding formats (MPEG, DivX, MPEG4, AC3, DV...).

-- 
FFmpeg packaging



More information about the pkg-multimedia-commits mailing list