[SCM] libav-extra packaging branch, ubuntu, created. 10ed1c3cafc96bfb8665bc4b491196be8272a712

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Fri Jul 22 07:12:29 UTC 2011


The branch, ubuntu has been created
        at  10ed1c3cafc96bfb8665bc4b491196be8272a712 (commit)

- Shortlog ------------------------------------------------------------
commit 10ed1c3cafc96bfb8665bc4b491196be8272a712
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Jul 22 08:58:05 2011 +0200

    make version number non-native

commit 8da3e77ca663f734254772730d1658ed160ff896
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Jul 22 08:56:56 2011 +0200

    update debian/changelog

commit 7cbfe1870ba38ac22c4aceea27067e09f8eb1bd0
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Jul 22 08:56:09 2011 +0200

    update gbp.conf

commit 92c5226ef947043e321bc03d401ddd1359625fcd
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Jul 22 08:55:21 2011 +0200

    Update to my @debian.org email.
    
    (cherry picked from commit 8020d1f0aef3c0e2a9b70f20c0b2aed0eafda62f)
    
    Conflicts:
    
    	debian/changelog

commit 65bec8a1acf2b6dfe2361267c1d1ed5ef585fcf4
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jul 17 22:33:18 2011 +0200

    Pass --arch to configure
    
    This helps compilation on systems that run 64bit kernels on 32bit
    userland. Upstream considers such configurations as "cross
    compiling". While on most architectures the configure script gets it
    right nevertheless, on architectures such as mips, it is not able to
    find out the 'native' build architecture due to various abis. This
    change is supposed ti assist the configuration process.
    (cherry picked from commit 27301ced78552bd4a95a9502cb67acd58b3fd297)

commit ee09986f3c65a07aa2378008e7667265dc2bac16
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Jul 22 08:54:11 2011 +0200

    no longer generate 'snapshot_version'
    
    now that we track releases and upstream has switched to git, recording
    the svn revision does no longer make sense.
    (cherry picked from commit 4f869368fd7ef997dd009e29e2f2f5da7a225e51)
    
    Conflicts:
    
    	debian/rules

commit c02609df67a4472ca696bb0bf94fa22f5592f647
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Jul 21 13:41:46 2011 +0200

    Fix installation of codecs.txt and formats.txt
    
    (cherry picked from commit 04bb0042201236882a97f9fb0c2cf813b4b0b825)

commit a77ec6fd82e93980a845eba65383a70eeba70781
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jul 19 07:49:07 2011 +0200

    Use proper architecture wildcards for Linux-only dependencies, Closes: #634460
    
    Thanks to  Robert Millan <rmh at debian.org> for reporting.
    (cherry picked from commit 4895df159eda662758dd851fe4b9554a1d43d1c9)

commit 50114c39411de1038a39938acb15c0dd31ba3d39
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Jul 22 08:50:07 2011 +0200

    bump dependency on libav-source

commit f86829d3955f5bce1e301661f76f068f662c3cfe
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Jul 22 08:49:24 2011 +0200

    update debian/changelog

commit 9a9ea9015b354ceaba2df8fd34a86df5384b932e
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Jul 1 21:58:47 2011 +0200

    update debian/changelog

commit 753c476cf99340c92f4dd84ccabdbdd31ca76223
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Jul 1 21:57:38 2011 +0200

    Cleanup after LP #802116, fixes LP: #804452

commit 4bc29ee9a210172b9fd8a58f345fe189d236d63a
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Jun 27 09:19:18 2011 +0200

    update debian/changelog

commit c8597333ec31d36b98ff45492e8c66698504963f
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Jun 27 09:18:57 2011 +0200

    complete renaming of libswscale-extra-1 to libswscale-extra-2 package

commit 8cf79fb3820ead31da64c033b5c344e693e80d15
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Jun 27 08:34:31 2011 +0200

    update debian/changelog

commit caaba5bd19e5f57af3c3090767941ed9a479d746
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Jun 27 08:34:25 2011 +0200

    Rename libswscale-extra-1 to libswscale-extra-2 to follow forgotten SONAME change. LP: #802116

commit b9d5a7078d73adcd139105f2d81d572ab2b57349
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Jun 22 10:51:39 2011 +0200

    update debian/changelog

commit 38d69d536b92bd85fde3732283a3d05b82ece15c
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Jun 22 10:53:22 2011 +0200

    tighten dependency on libav-source

commit f0a0897e1353b96f3c3a3fb8a4ed267cf872be99
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Jun 22 10:54:49 2011 +0200

    remove accidentially merged new files

commit eaff13128fd5320789c70b1b28a1cd28fda3bf7b
Merge: dee2e1e 2f37083
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Jun 22 10:50:10 2011 +0200

    Merge branch 'ubuntu' into ubuntu.extra

commit 2f37083510771e20401649f7eb9bbe33f1b43206
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Jun 22 10:47:29 2011 +0200

    update debian/changelog

commit 655c602350876e14a9938dea4ff0cc64e0a70587
Merge: 2d04f71 b46f2a2
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Jun 22 10:46:51 2011 +0200

    Merge 4:0.7-1 into ubuntu

commit b46f2a2c17ce899cae2b9b623788a2da2e51d0cb
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jun 21 13:08:21 2011 +0200

    update debian/changelog

commit 1d5ddfabcf4944c554a07cf108c41ed3cdb4fd36
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jun 21 13:07:46 2011 +0200

    Bump Standards-Version

commit 2c296e69fbefb1f34e8aadef74c6b58f47b7564f
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jun 21 07:50:06 2011 +0200

    update debian/changelog

commit 65f8b0e62c40e21b145158c72b0063a5fa7d8bda
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jun 21 07:52:35 2011 +0200

    bump shlibs

commit b0b98990596097ebd328dccb2398cc1477aaf7d6
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jun 21 07:52:12 2011 +0200

    bump libswscale SONAME

commit 211ecebed1426fbfa97008fef540a0458759f548
Merge: 31e3eea 608587c
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jun 21 07:45:04 2011 +0200

    Merge branch 'upstream'

commit 608587cad829e5182def255ca4ffb7e3652c3519
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jun 21 07:43:15 2011 +0200

    Imported Upstream version 0.7

commit 31e3eeabd98909da8a808d7425751576323ea108
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jun 21 07:41:07 2011 +0200

    add debian/source/local-options

commit dee2e1e59255886f6e70cfb63f44c32515ab9e84
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jun 18 17:15:10 2011 +0200

    update debian/changelog

commit 7a05c5ada12bf1c6a85e7389f66d356e38ed836e
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jun 18 17:14:59 2011 +0200

    minimize delta with ubuntu branch
    
    these dependencies are picked up later automatically

commit 1f8fdd48b7570a93ed6035f4448f28163e458bed
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jun 18 17:14:38 2011 +0200

    remove duplicated dependency on librtmp-dev

commit 4093f727c37702d68dd80f7165523b9f12fe5b5a
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jun 18 17:14:12 2011 +0200

    tighten dependency on libav-source

commit 05e238447d6ef656d090949957a0d24bab193992
Merge: 7bdef82 2d04f71
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jun 18 17:09:53 2011 +0200

    Merge branch 'ubuntu' into ubuntu.extra

commit 2d04f71e0fdc723b1b996985632098622a1af3c3
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jun 18 15:43:35 2011 +0200

    update debian/changelog

commit a48ac4f66bcb9b6aafb8b27db35154c39f0ba407
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jun 18 15:46:52 2011 +0200

    remove check for libfaad
    
    the wrapper is gone for good upstream

commit 4ab8620aeae532086018d06388156699ed358ee9
Merge: 225f12a fe8e28b
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jun 18 15:43:09 2011 +0200

    Merge branch 'master' into ubuntu
    
    Conflicts:
    	debian/changelog

commit fe8e28bec16d0727def11525f573ba11d47cb3b0
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jun 14 22:06:12 2011 +0200

    ignore lintian warning: "dbg-package-missing-depends ffmpeg-dbg"
    
    ffmpeg-dbg is an empty, transitional package

commit 249639776abc22c19a1616cef4eb0f833e33c468
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jun 14 22:01:37 2011 +0200

    update debian/changelog

commit f2a6d3cae9b5c7ff51c7beb76497f368b0b53dba
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jun 14 22:03:26 2011 +0200

    remove 02-Fix-kfreeBSD-FTBFS.patch, applied upstream

commit a609dcb82ecc8d296e737f20ac95bbeda8444277
Merge: 25b4e18 5900202
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jun 14 21:54:17 2011 +0200

    Merge commit 'upstream/0.7_rc1'

commit 59002023f2a279994a757979c5efec921e830675
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jun 14 21:54:12 2011 +0200

    Imported Upstream version 0.7~rc1

commit 225f12a885cfa55f7b17fee9b20e78c1b3e36a24
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri May 27 19:28:22 2011 +0200

    update debian/changelog

commit 49954eff377b76941786ba1e9c483349c955bc09
Merge: 9467e81 25b4e18
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri May 27 19:26:31 2011 +0200

    Merge commit 'debian/4%0.7_beta2-2' into ubuntu

commit 25b4e1894ea2f93065be1e01ad24cddd69816be8
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun May 15 10:52:47 2011 +0200

    Add additional debhelper specific ${misc:Depends} substvars
    
    reported by lintian

commit 0711b5b2a9e085639ce25b907e72772d0861cddc
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun May 15 10:50:05 2011 +0200

    update debian/changelog

commit 0e8098093527db8e59c2656d39e0c9deb774256c
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun May 15 10:40:53 2011 +0200

    ignore quilt .pc status directory

commit b61ca61d8a9edcfc63dbf17800bee9e0083fc066
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun May 15 10:40:36 2011 +0200

    add patch from upstream to fix build failure on kFreeBSD

commit 0fd339ad301cf4fb19fab4bc9be15e9c8f032403
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun May 15 10:38:24 2011 +0200

    rename Tweak-doxygen-config patch

commit 902ea947130027793d9db1a43ca30b8f7d3ccb3d
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri May 13 12:33:08 2011 +0200

    refresh patches

commit 3043258ee55f9c19f32df6fd4335ab9f8265838e
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri May 13 12:31:40 2011 +0200

    finalize debian/changelog

commit 940dc00154d6f292ef2231d58ad054563692aa4e
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri May 13 12:19:11 2011 +0200

    remove readd_avcodec_thread_init.patch, applied upstream

commit 895282f84073577c6f6765877278ce9dba1a5ae3
Merge: 69ae71a c15fbb9
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri May 13 12:27:41 2011 +0200

    Merge branch 'upstream'

commit c15fbb95ae00ea98d055e9750ac3e9ab406ff916
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri May 13 12:15:03 2011 +0200

    Imported Upstream version 0.7~beta2

commit 69ae71a09af49ae0074a629d63d80559388c3912
Author: Jonathan Nieder <jrnieder at gmail.com>
Date:   Mon May 2 19:24:05 2011 -0500

    debian/rules: allow clean as non-root
    
    After running "debian/rules build" as an unprivileged user, there is
    no reason to require (fake) root privileges to clean up.  Even when
    cleaning up after "sudo debian/rules install", at worst the clean
    target would error out because unable to remove a file in a directory
    owned by root and the operator will know to run "debian/rules clean"
    as root to fix it.
    
    Signed-off-by: Jonathan Nieder <jrnieder at gmail.com>

commit c260bc50c75b82b0bba286d8ceff8e0f8f991878
Author: Jonathan Nieder <jrnieder at gmail.com>
Date:   Tue May 3 13:23:37 2011 +0200

    use source format 3.0 (quilt)
    
    Allow dpkg-source to apply patches when unpacking the source.  We no
    longer need to keep track of whether the source is patched or not, and
    quilt is no longer required at build time.

commit b48d16cffe71fc3e2ff8197b517b2635464e9e3f
Author: Jonathan Nieder <jrnieder at gmail.com>
Date:   Mon May 2 19:20:32 2011 -0500

    clean up NEWS.Debian and related documentation
    
    libav provides a NEWS.Debian file under debian/ but does not install
    it currently; rename it to libavcodec-dev.NEWS so apt-listchanges can
    automatically install it.  Only installing in a -dev package ensures
    sysadmins without the development libraries installed don't have to
    worry about API changes that will be irrelevant to them.  Just the
    libavcodec-dev package should be enough to make the API changes
    visible.
    
    While at it, move APIchanges.gz so it is just installed by the various
    development libraries and libav-doc.  The details of the API would be
    irrelevant to someone just using programs that use the library.  Maybe
    APIchanges should just be in libav-doc, but to be conservative this
    keeps it in the development libraries too for now.
    
    Now that NEWS is attached to a particular package and shown on
    upgrade, it does not seem like a good place to mention the source
    package renaming, which does not require any action in response to the
    upgrade.  Move the note to README.Debian, where it is more likely to
    help the confused reader.
    
    Signed-off-by: Jonathan Nieder <jrnieder at gmail.com>

commit da86d5d79c61cc03af0fdb2bf3fc11e38bf3ca4f
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue May 3 13:13:03 2011 +0200

    start new upload

commit 07d2185393677e3524470d261a1fc55ee39693e3
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun May 1 18:59:50 2011 +0200

    finalize debian/changelog

commit 602aad46eaa617901499261a167da85e8a715223
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun May 1 20:40:43 2011 +0200

    remove overly strict Breaks and Replaces relationships from ffmpeg-dbg package
    
    They don't really help upgrades, this is a transitional package

commit 4579c7f9894b004e35336154c61d5d8cb38542fc
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun May 1 19:55:27 2011 +0200

    replace an additional ffmpeg reference in the package description

commit f0ffcada649a576b5942e835f4908305e7469f62
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun May 1 19:54:41 2011 +0200

    fix typo in path doc/APIchanges

commit 27c07728052d137ceb7fea1011060575abb9d12d
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun May 1 19:05:40 2011 +0200

    update debian/patches/readd_avcodec_thread_init.patch

commit 86dc54601d01673f1c604d82cf4f1b12de6d5dc0
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun May 1 18:57:39 2011 +0200

    readd deprecated avcodec_thread_init in libavformat
    
    patch backported from master, will be part of beta2 release

commit 9467e814bd64404cafb6646dac5e991cd2a43529
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Apr 30 14:27:56 2011 +0200

    finalize debian/changelog

commit 92cd8634ccc2e14dbf490ce6e3f629a06dc6df25
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Apr 30 13:25:01 2011 +0200

    update debian/changelog

commit 1a6ea9e35d52d855fcd7be4b8a6c921de074ac2c
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Apr 30 13:24:09 2011 +0200

    fix typo in filename doc/APIchanges
    
    fixes FTBFS

commit 5d35e4053cda311718ef89e06e8a06280868235f
Merge: f0b9818 f7e12b4
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Apr 30 12:10:33 2011 +0200

    Merge from debian/experimental

commit f0b9818e6da91f217086dbb465d852a5fa9de909
Merge: bd2815f 6ab7c07
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Apr 30 12:06:06 2011 +0200

    Merge remote-tracking branch 'origin/upstream' into ubuntu

commit f7e12b45758c6bc7811bc2dd283e5ceb95470672
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Apr 22 11:42:32 2011 +0200

    install doc/APIChanges and refer to them in NEWS.Debian (Closes: #623682)

commit 6836f746b8ff74dc040906462e5b5aa4a3f5c747
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Apr 22 11:38:58 2011 +0200

    add NEWS.Debian file

commit 80928e504c477550dd40171cd7417092f813d876
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Apr 22 11:16:23 2011 +0200

    don't try to install non-existing documentation, fixes FTBFS on powerpc

commit 27c386b0dfcb8f1ee65b2fa372954780916e21df
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Apr 20 14:49:50 2011 +0200

    enable yasm on architecture that have it installed
    
    Fixes FTBFS on kfreebsd-i386 and kfreebsd-amd64

commit 283e3ebadbdb5d864eddfe5b8ca36c0ef9928482
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Apr 20 14:46:51 2011 +0200

    start new upload

commit e75ddca5a786dfd09bd2a77232dda9a09b77ddbc
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Apr 19 15:05:11 2011 +0200

    update debian/changelog

commit 6ab7c070598b639e800f766bb11c5d0ad436d96a
Merge: 0ed2efd aad5294
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Apr 19 15:01:34 2011 +0200

    Merge remote branch 'origin/upstream' into upstream
    
    fake merge with no changes.
    
    I forgot to update my local 'upstream' branch.

commit be60668f3f7db9f471854dda31f62a35b3acd0c0
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Apr 19 14:58:58 2011 +0200

    also update the *contents* of the lintian overrides

commit a5b847b19f92cd19bb0a5ae82d0a5d8b0d8829cc
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Apr 19 13:33:52 2011 +0200

    libfaad wrapper has been removed upstream

commit 84fb8aa49bd491fc0e099dc2712fde000d23736c
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Apr 19 13:32:25 2011 +0200

    drop avfilter confflags, it is enable by default in 0.7

commit b3890b5b1c901fe0251762b7ae1ec6accc922ff6
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Apr 19 13:27:04 2011 +0200

    remove patch disable-configuration-warning.patch
    
    patch needs to be adapted/rewritten for 0.7

commit 2e4976cb9bb8d65c554aa2df036f7ea90ecc4103
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Apr 19 13:26:13 2011 +0200

    the MAINTAINERS file was removed upstream

commit 0f90a4125c897797848c9194d853d5f24e5b22a8
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Apr 19 13:24:36 2011 +0200

    configure flags --disable-stripping was removed upstream
    
    binaries are now always unstripped

commit 6c7db79e30c85ebe8acee38316e38b0ad0a37858
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Apr 19 13:23:51 2011 +0200

    bump SONAME and SHLIBS

commit 4c669e9b23567e6c32d5f456b002bd416c95bfb6
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Apr 19 12:53:21 2011 +0200

    update debian/changelog

commit 6fd0d00bdaabcfd9ad21c47710e20c5d5ddf77d4
Merge: c8d7032 0ed2efd
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Apr 19 12:52:06 2011 +0200

    Imported Upstream version 4:0.7~b1

commit 0ed2efd3a7a7a0aa314126f5c06d0757be3edb54
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Apr 19 12:45:53 2011 +0200

    Imported Upstream version 4:0.7~b1

commit c8d70325672d5ff188a7f0cf27a92c626f83e0e2
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Mar 29 22:54:34 2011 +0200

    Disable warning about library configuration mismatch

commit 2595c2f002eb03f3e97d9778d1702b6e953cb874
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Mar 29 17:34:11 2011 +0200

    update upstream site to libav

commit 7bdef8211925a57f2d6de617777d3a2f58d4adce
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Mar 24 15:42:40 2011 +0100

    update debian/changelog

commit b879236cb457199ef666ea0fea6a978df50b54b1
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Mar 24 15:41:04 2011 +0100

    fix path to powerpc extradoc

commit 937a24d818ed5719d90b357fbd28a4e9069de957
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Mon Mar 21 11:13:21 2011 +0100

    Add libjack-dev to Build-Depends.

commit 6d3e17980121e27bcfd113f2e0561d93aca1a5be
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Mar 20 17:25:51 2011 +0100

    compile with "-marm -fPIC -DPIC" on armel
    
    this originally comes from Ubuntu, but I'm happy to here any qualified
    suggestion from arm porters.

commit 8149acb63b6ec4c35e2acac737fc0ee6f7c4fd32
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Mar 20 17:23:04 2011 +0100

    reenable AAC codec on ia64

commit c2fc9e1f867c9493379918201ae8680df6c9c1e2
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Mar 20 11:58:09 2011 +0100

    exclude more cruft from libav-source tarball

commit 43040cd3753c1374fe8491c4e7ce06e65603317f
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Mar 20 17:21:50 2011 +0100

    syncronize configuration flags with Ubuntu

commit 6c94102c69f1a16f63f907283f68808f8381adcc
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Mar 20 17:19:59 2011 +0100

    prepare new upload

commit 47af600b192e75b4f5aaf20b872d1cc13d2df76f
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Mar 20 11:29:19 2011 +0100

    remove all sources from branch and rely on libav-source package instead

commit bd2815f59fff8d77a4f9db0f8930371cca07bd51
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Mar 20 12:09:43 2011 +0100

    fixup upload target and formatting of debian/changelog

commit dab28bc3b29224e437cf00d61ad70e3d54898dea
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Mar 20 12:01:34 2011 +0100

    minimize diff to debian package

commit ddc630e7167df7362df2b7373b3a3f68c751933c
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Mar 20 11:58:09 2011 +0100

    exclude more cruft from libav-source tarball

commit 49741c10727827978b409fedf9a61202684538a6
Merge: 72e85c1 14560da
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Mar 20 10:52:23 2011 +0100

    Merge branch 'ubuntu' into ubuntu.extra
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/rules

commit 72e85c143b8513ec9532ca2dd6e2b6446d8891e5
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Mar 20 10:43:15 2011 +0100

    Switch to libav packages
    
    ffmpeg-doc -> libav-doc
    ffmpeg-dbg -> libav-dbg

commit 45295c9d079fb0b33ec5a27cae0b4a8791ca3055
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Mar 20 10:44:52 2011 +0100

    don't build depend on libav/ffmpeg libraries

commit 14560da9356a36d89951007b81be8bd21514b98f
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Mar 20 10:33:26 2011 +0100

    fixup broken changelog entry for version 4:0.6.1-5ubuntu2
    
    avoids annoying lintian warnings:
    E: libswscale-dev: debian-changelog-file-contains-invalid-email-address gal-fourier at trac
    W: libswscale-dev: debian-changelog-line-too-long line 2
    W: libswscale-dev: debian-changelog-line-too-long line 4
    
    on EVERY binary package

commit 19a89fc4d7e9f745dd72dcd3bd2c3a55118afb40
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Mar 20 10:26:11 2011 +0100

    prepare new upload

commit 68df93735602070fd013810399d50b4c301329db
Merge: 450bfc1 487ec5f
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Mar 19 22:25:30 2011 +0100

    Merge commit 'debian/4%0.6.2-1' into ubuntu

commit 450bfc1e1c555e30acf07dec8aafe4f9f3d8b208
Author: Gal Shalif <gal-fourier at trac>
Date:   Mon Mar 14 13:47:24 2011 +0200

    Imported Debian patch 0.6.1-5ubuntu2

commit 487ec5f84f54e4605afabb2886f7ef2e25e538f1
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Mar 19 11:17:56 2011 +0100

    update debian/changelog

commit 8a0df8b70744388035c7d151753cec023e90545a
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Mar 19 09:21:02 2011 +0100

    Introduce 'libav-source', which contains the patched sources of libav
    
    this package will be used as build dependency of 'libav-extra'

commit cf3037e9877fa644a1606a44e5047ad38f8ee89c
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Mar 19 09:28:45 2011 +0100

    make buildlogs verbose

commit 80308a5399c12fecd10cbb891fddb838fc28bcdd
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Mar 19 09:11:36 2011 +0100

    Switch to libav packages
    
    ffmpeg-doc -> libav-doc
    ffmpeg-dbg -> libav-dbg
    
    also add transitional packages

commit 510906913142610ba6c6fe32934355ded75b4c2e
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Mar 19 08:16:09 2011 +0100

    update version numbering

commit a1da5674522cfc1c2e2c00b406b4623fd5779376
Merge: ea8c162 aad5294
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Mar 19 08:15:18 2011 +0100

    Merge branch 'upstream' (libav 0.6.2)

commit aad52940050693538757a8dd84957840d92f28ec
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Mar 19 08:14:44 2011 +0100

    Imported Upstream version 0.6.2

commit ea8c16263c81651c06e688eab9664932d76aad25
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Mar 19 08:14:18 2011 +0100

    rename source package to libav

commit 6a44cad2dae0cba51324a08f72fa264a4b8dcf6e
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Mar 19 08:14:02 2011 +0100

    prepare new upload

commit 482f041614b134b32bc2c0ac0ce788c77c81ef98
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Fri Mar 18 12:33:40 2011 +0100

    Fix cp of doxy documentation fails with "Argument list too long" (Closes: #618679)

commit e04439a1ba129e402bcf0dfad20feb12e8a4b8ba
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Mar 3 07:23:30 2011 +0100

    copy in changelog entries from the 0.5 packaging branch (Closes: #616190)
    
    the branches diverged for quite some time and merged went mostly in one way

commit 2580768e5254fd8b62b7ed8bea2a9b91906689c6
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Feb 13 20:05:47 2011 +0100

    update debian/changelog

commit 74dd38f86c5d5d0cc295d97807e6f6d6a4711dbb
Merge: 012f339 ee481e3
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Feb 13 20:03:44 2011 +0100

    Merge remote branch 'origin/master' into ubuntu
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/gbp.conf
    	debian/rules

commit ee481e32a74e5b863851cee273a6ee83c58a8fb9
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Feb 13 09:27:07 2011 +0100

    update debian/changelog

commit 481f09d7a7294e952cd41c51f66e9e857496860a
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Feb 13 09:20:55 2011 +0100

    don't libva usage on hurd only
    
    Seems to build file on s390.

commit c11505fd6c285f385888dbc61c185db15545f201
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Feb 9 07:16:20 2011 +0100

    Force upgrade of mplayer pre-rc4 for upgrades of libswscale, Closes: #612292

commit 31c587baf4bcd7c69f997b66eb1a82825592611d
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Feb 9 07:04:13 2011 +0100

    minor updates to libswscale0's package description

commit d097e5e16d8b8b465900bc248da23468b52ea29c
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Feb 9 07:03:19 2011 +0100

    don't enable vaapi support on s390 and the hurd

commit 0ee326dcd1ea799d115855e68af3d232d8bfde38
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Feb 9 06:58:22 2011 +0100

    start new upload

commit 3ed1015fc21fff69d0b4c0ee065ed976e989dcb6
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Feb 6 09:03:38 2011 +0100

    start new upload

commit 5d47b4fee46f8fa9e4361feaca3c0f3b20652007
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jan 29 21:44:11 2011 +0100

    update debian/changelog

commit 87a80c185efe03954a343e56518501ebfbab9f78
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Jan 31 07:00:23 2011 +0100

    also for upgrades of the 'mplayer-gui' package (Closes: #611579)

commit 61fc244f34bd4ec29e6b052af422f0534beaf10c
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jan 30 09:21:19 2011 +0100

    revised package descriptions

commit 17e588e364b1f67c5e4c513bd24a91292bf24522
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jan 30 08:38:55 2011 +0100

    sanitize LDFLAGS variable
    
    it seems that dpkg-buildflags injects -Wl,-Bsymbolic-functions to
    LDFLAGS, which breaks the build on amd64. The exact cause is unclear,
    but our current theory is that -Bsymbolic-functions disables -Bsymbolic,
    on which the build system relies:
    
    21:27 <mru> siretart: so maybe the second flag disables it for data symbols
    21:28 <mru> ld manual isn't very informative in that regard
    21:28 <siretart> that's indeed a theory that would explain this mess
    
    Cherry-picked from http://bazaar.launchpad.net/~siretart/ffmpeg/packaging-trunk/revision/14

commit cc0b5f643d8a42a7efbf7e34d2f94755b51a02ee
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jan 29 22:06:01 2011 +0100

    call gpl_confflags macro properly
    
    Git-Dch: ignore

commit c652fe055c120f9451db87cf1c5d48c9a4ec9bd5
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Jan 28 23:27:24 2011 +0100

    simplify lintian-overrides
    
    this makes the overrides also more robust for future upstream changes
    (cherry picked from commit 6f0c1c8d5175412fa283d4c3b50169ab33d0ab5e)

commit acef44209adb1c8dc47eb8c09e4d7acfaf257004
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jan 29 21:37:11 2011 +0100

    track 'master' branch

commit 99060bdfbbf7f906658e7bc72bd34cbe3cd61438
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Jan 28 23:14:50 2011 +0100

    remove README.upstream-upgrade
    
    FFmpeg has now moved to git and does proper releases these days. This
    makes upgrading to new upstreams versions more straight-forward, so that
    we can drop this potentially confusing information.

commit 88a8b9a072d47905142eefc24dc3c90a210167bd
Merge: cb49ef8 d70e0b6
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Jan 28 22:58:26 2011 +0100

    Merge branch 'master' into master.snapshot

commit cb49ef8e70c9e3a1c084dfc33aef27c1ff91e974
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jan 23 09:28:23 2011 +0100

    remove note about packages being "Debian-specific"
    
    This note is potentially confusing. It was introduced at a time where we
    shipped ffmpeg packages with an debian specific SONAME (e.g.,
    libavcodec.so.0d, etc.)  We now use the upstream SONAME, so this note
    has become obsolete for quite some time now.

commit 659659f82df480c9f96236970f8d5bc702a56909
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jan 23 09:20:48 2011 +0100

    enable dirac conditionally (not in ubuntu/main)

commit 8b3d9dc2d24064089edabbd9c3c8dc9ec6deeae1
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jan 23 09:16:28 2011 +0100

    enable libopenjpeg conditionally (not in ubuntu/main)

commit 4dd74fcd3e2214c3a64bffdb419df403cb36b2c0
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jan 23 09:11:25 2011 +0100

    sort gpl_confflags

commit 07de9bc269ad53a86e09ef79f92559e4c7ad3b94
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jan 23 09:10:30 2011 +0100

    sort build-dependencies alphabetically

commit 89b0b08109a323e2d6802dc1540741d182a5680c
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Nov 19 12:15:29 2010 +0100

    update debian/changelog

commit 1130d4323045bd782baad369417dce368970b9a7
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Nov 19 12:16:27 2010 +0100

    force upgrade of the mplayer package

commit efd96c086b79b2bbdaa3ca1b2e873b8bf179c5f0
Merge: 77e3fd2 012f339
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Nov 19 12:14:59 2010 +0100

    Merge branch 'ubuntu' into ubuntu.extra
    
    Conflicts:
    	debian/changelog
    	debian/control

commit c94770e72acf2cdddf8c7959c59da3964bbcafef
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Nov 19 12:12:31 2010 +0100

    add libxfixes-dev to build depends

commit b856abdfc4875f265aed584e164e5ca55da8f88a
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Nov 19 12:11:51 2010 +0100

    start new upload

commit 012f3392c047e6917b9908b35b17623d0ec546c7
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Nov 19 12:05:55 2010 +0100

    update debian/changelog

commit 971a8108b93278c5983764544f705378d642b514
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Nov 19 12:11:00 2010 +0100

    fix description in libswscale-dev

commit 4bc54091b2ca62bc7ec20019d652ab7b230cb631
Merge: 24a7f41 02a1443
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Nov 19 12:05:17 2010 +0100

    Merge commit 'debian/4%0.6.1-2' into ubuntu
    
    Conflicts:
    	debian/changelog
    	debian/control

commit 02a14434c9f6482fef25aab5dee0d211290d4153
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Nov 19 10:51:07 2010 +0100

    update debian/changelog

commit ff237f16fd55d650a84963b3b17520e54ce6fccd
Author: Matthias Klose <doko at ubuntu.com>
Date:   Fri Nov 19 10:49:30 2010 +0100

    Configure with --enable-pic on powerpc. LP: #654666.

commit 9a0c497b18bdfb0534d473c83a7e62ea60c40220
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Nov 19 10:46:03 2010 +0100

    Bump Standards-Version, no changes needed

commit 24a7f41439ab0526dd867b751f8f0309cd08008f
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Nov 14 21:20:55 2010 +0100

    update Standards-Version

commit 77e3fd2b00d8e254ea1322d4e9b74d1af96872ae
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Nov 14 21:03:53 2010 +0100

    update debian/changelog

commit 941dc9414a70b2b173e7a32e6cc77bbddebd1106
Merge: 9c6b5aa 873c92e
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Nov 14 20:30:14 2010 +0100

    Merge branch 'ubuntu' into ubuntu.extra
    
    Conflicts:
    	debian/changelog
    	debian/control

commit 873c92e8d235ef506ac1505c9c20f334d45440e7
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Nov 14 17:21:47 2010 +0100

    update debian/changelog

commit bc6857326d3ad03151064a6b07414ac7e7fc95fe
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Nov 14 19:37:19 2010 +0100

    remove fix-CVE-2010-3429.patch, applied upstream

commit 124f00be0188723216c62621fe041b1c9f586988
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Nov 14 17:21:31 2010 +0100

    remove unnecessary replaces/breaks
    
    this minimizes the diff to debian

commit a6ae5fb03181a8ed3179cd21903846126704d55b
Merge: 7e55d94 983ce43
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Nov 14 12:19:28 2010 +0100

    Merge commit 'debian/0.6.1-1' into ubuntu
    
    Conflicts:
    	debian/changelog
    	debian/confflags
    	debian/control
    	debian/patches/series

commit 9c6b5aa9b091df9d2785fb09826628c3f147a674
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Nov 14 11:35:39 2010 +0100

    update debian/changelog

commit 001d453c024dfc6a313cf52d585a1ed2d724be45
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Nov 14 11:34:52 2010 +0100

    Remove dummy packages with 'unstripped' notation
    
    These were necessary for transitional purposes only

commit 9e90945acdcb06408cf618592d1e12852904d955
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Nov 12 17:50:24 2010 +0100

    update debian/changelog

commit 71443fe2c73223ebeadcce1f2af4c0344f1a6638
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Nov 12 18:38:03 2010 +0100

    Bump Standards Version

commit 24a730d47aceaff55133f36109ba9d25594cc877
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Nov 12 17:48:37 2010 +0100

    build against librtmp-dev, closes LP: #673850

commit 72a7d8569f71a6c33413d51571a048c5de4156ab
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Nov 12 17:47:34 2010 +0100

    sort build-deps alphabetically

commit 05cda2a6f0d5328364280fffdd76c9ea520d0df7
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Nov 1 14:14:37 2010 +0100

    Adjust changelog (tidying too late: was already released).

commit d70e0b63233c5dc9d4ffa4d2481a67b9543ab5b0
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Nov 1 14:01:55 2010 +0100

    Add myself as uploader.

commit 5b400bd4c1e701dc3d76e552597f52dd4c8659ee
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Nov 1 14:01:40 2010 +0100

    Single-space indent continuated lines in control file.

commit aad4354f0539c168797162b6545f1b2cd5acdca3
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Nov 1 13:58:42 2010 +0100

    Update changelog, tidy it, and tag it as UNRELEASED.

commit 1ec81b045a465d87b6d5c2bca69ec4869d543232
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Nov 1 13:57:29 2010 +0100

    Add myself as uploader.

commit a7f4ee49925a3a49cef6d6e69b54c088658f5030
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Nov 1 13:57:00 2010 +0100

    Single-space indent continuated lines in control file.

commit fbc036bee0e14c53acb1a8356b99de3c76d4ccdb
Merge: 6b4fa62 983ce43
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Nov 1 13:53:44 2010 +0100

    Merge branch 'master.snapshot' of git.debian.org:/git/pkg-multimedia/ffmpeg into master.snapshot

commit 6b4fa6212694952aa4c07ce1a50194a945dadd9f
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Nov 1 13:52:55 2010 +0100

    Relax mplayer Breaks to permit backports and other early releases.

commit 983ce436bc1e5559876013a55d7ed01ffa48d060
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Nov 1 09:18:26 2010 +0100

    update debian/changelog

commit 2ff21d64e0bc44fc051825d383ec485b88d07c8f
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Nov 1 09:16:58 2010 +0100

    remove 0004-cpp-hack.patch
    
    experiment didn't work out, applications still need to be patched

commit c14f16794eb9fa65c15879868947589775d35136
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Nov 1 09:15:34 2010 +0100

    add gitignore file

commit c7faf5a1c3dcdc29e7b046c49a45cb453d8382a0
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Nov 1 09:15:19 2010 +0100

    remove patches merged upstream

commit 424aee133221de0051f7a6d882af8097a42aa719
Merge: e44dcaf e877381
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Nov 1 09:13:16 2010 +0100

    Merge commit 'upstream/0.6.1' into master.snapshot

commit e87738170b535dc8713108c0c38cbec741218f34
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Nov 1 09:13:09 2010 +0100

    Imported Upstream version 0.6.1

commit e44dcaf290feeefc55e49a433cf9ef45aa2ddf71
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Nov 1 09:12:33 2010 +0100

    search for gzipped tarballs

commit 6838ed0a8226e0718c7d127452861827b4ff7f11
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Oct 5 22:17:38 2010 +0200

    update debian/changelog

commit 45a94a983c7dca7882ffb5a352dea40215eda035
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Oct 5 21:42:35 2010 +0200

    update debian/changelog

commit 7eb00e4f00e7cd8181ed46b2dbc8a1b772c81cbf
Merge: e4a240d 7e55d94
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Oct 5 21:39:30 2010 +0200

    Merge branch 'ubuntu' into ubuntu.extra
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/rules

commit 7e55d9493bd67372b3965ed955b66ffb494b30a6
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Oct 5 21:27:17 2010 +0200

    update debian/changelog

commit add869c4aa3d551e76f9609f098f273a28bbc563
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Oct 5 21:25:32 2010 +0200

    fix dependency on libswscale-extra-0, LP: #637895

commit ecc47e671a07bc3c4dbd9a5cc9e5a1cf124aaf0d
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Oct 5 21:13:20 2010 +0200

    update debian/changelog

commit 55ebda6227d2061723363b05e16835121458baf6
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Oct 5 21:12:32 2010 +0200

    Add flic video patch. Fixes CVE-2010-3429

commit 729a36a58da6ab50122d17483d053b803f89c8bc
Author: Matthias Klose <doko at ubuntu.com>
Date:   Mon Oct 4 19:39:46 2010 +0200

    Imported Debian patch 0.6-2ubuntu4

commit ffd85fd0085e0a194d79bba63a6d4fc155c58571
Author: Dominic Evans <oldmanuk at gmail.com>
Date:   Fri Sep 10 14:21:23 2010 +0100

    Imported Debian patch 0.6-2ubuntu3

commit 59bb4dc101b4cec3c2210d7a4a628af709e8399f
Author: Loïc Minier <lool at dooz.org>
Date:   Tue Oct 5 11:38:58 2010 +0200

    neon: set arch via --cpu instead of --extra-cflags

commit cd22fd4f30f81fc1d2fe789f2c0265a21f96c0a5
Author: Loïc Minier <lool at dooz.org>
Date:   Tue Oct 5 11:37:08 2010 +0200

    Drop -marm; obsolete
    
    Stop adding -marm to --extra-cflags as this is useless since upstream
    r20144.

commit d4c7363cfb8c1d3ca42e8d6a4aae0615a57bf75b
Author: Loïc Minier <lool at dooz.org>
Date:   Tue Oct 5 11:33:47 2010 +0200

    Drop -fPIC -DPIC when CPU is arm; obsolete
    
    Stop adding -fPIC -DPIC to --extra-cflags since that's not needed since
    upstream r20203.

commit d55f3375d48c30f11aecb704b55f73909504b2e6
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Oct 5 10:20:40 2010 +0200

    bump urgency

commit 861eccb513f9a84c719e18d02692301aeddc4ccf
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Oct 3 17:00:33 2010 +0200

    update debian/changelog

commit 7167e816236a0df01d671cdf0dd89cd7d8ba33e6
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Oct 3 16:59:09 2010 +0200

    Fix several security issues in flicvideo.c
    
    This fixes CVE-2010-3429

commit 10af6edde075228be2b39d8fc465935c4993442e
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Sep 13 11:06:01 2010 +0200

    finalize debian/changelog

commit fce7c2887306ee2cb83638610453fd7dab6871a2
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Sep 13 15:29:15 2010 +0200

    fix x11grab example in e.g. the manpage so that they actually work

commit a9b1a98d60a8123e35a84718901f37b67b20d396
Author: Dominic Evans <oldmanuk at gmail.com>
Date:   Sat Sep 11 09:05:31 2010 +0200

    add libxfixes-dev to build-depends to unbreak x11grab input, Closes: #596342, LP: #631103

commit 5d8b3a9c7c2fcc822e51a538ded9ccf5ba167674
Author: Loïc Minier <lool at dooz.org>
Date:   Mon Sep 6 16:29:59 2010 +0200

    confflags: only pass -mfloat-abi=softfp if needed
    
    debian/confflags: on ARM, only pass -mfloat-abi=softfp for the NEON and
    VFP flavours if the toolchain defaults to -mfloat-abi=soft.  Otherwise,
    don't pass anything, which means the VFP and NEON flavours will use the
    same calling conventions as the toolchain.
    
    Introduce a new $(check_cpp) macro for testing cpp output and tweak
    comments and cross-gcc invocations.

commit fe7065dba6abc8aa65265ec7baed0f67e8d9eb37
Author: Loïc Minier <lool at dooz.org>
Date:   Sun Sep 5 23:48:19 2010 +0200

    Use DEB_HOST_ARCH_CPU instead of DEB_HOST_GNU_CPU

commit bd5c20e84f1952675c6079f00284275a2af6c716
Author: Loïc Minier <lool at dooz.org>
Date:   Sun Sep 5 22:37:36 2010 +0200

    confflags: switch to DEB_HOST_GNU_CPU on arm
    
    debian/confflags: switch to testing DEB_HOST_GNU_CPU == arm instead of
    DEB_HOST_ARCH == armel as this is more portable (especially to armhf, as
    the arm port probably isn't used anymore, but that should still work).

commit 2851757ff0598fd49cdb58c10f66d3b74e610dc0
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Sep 2 15:37:29 2010 +0200

    Force upgrades of pre-rc4 versions of the mplayer package (Closes: #595241)
    
    mplayer traditionally uses some ffmpeg internals and mplayer rc4 is the
    first version of mplayer that is compatible with FFmpeg 0.6

commit 1ab46438ef4d4c21e4331c898c8a97e0bb3433e3
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Sep 1 21:00:29 2010 +0200

    start new upload

commit 82ebb4ff28096ea0a080a316c5d6648780ad02b4
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Sep 1 14:35:50 2010 +0200

    finalize changelog

commit 098fa19936a18617da91f6c73207a649f962a082
Author: Loïc Minier <lool at dooz.org>
Date:   Fri Aug 27 01:20:34 2010 +0200

    confflags: Pass -marmv7-a for the NEON flavor if needed; closes: #594093
    
    debian/confflags: detect whether the toolchain supports ARMv7 ("dmb")
    by default as the NEON pass needs at least ARMv6t2; if it's not enabled
    by default, pass -march=armv7-a in extra-cflags for the NEON pass since
    NEON implies ARMv7; closes: #594417.

commit 951df7fad50c6e4e998ba480f0b420f84b651183
Author: Loïc Minier <lool at dooz.org>
Date:   Tue Aug 31 12:58:48 2010 +0200

    Fix typo: use -march=armv7-a instead of -marmv7-a

commit 2be82b97292e0c240372d9f8dde125af25add8c4
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Aug 27 20:12:44 2010 +0200

    merged the last two changelog entries, -3 hasn't been uploaded

commit fb5f2c1f84464e985ac95e36c6671fa42aa1b028
Author: Loïc Minier <lool at dooz.org>
Date:   Fri Aug 27 01:40:30 2010 +0200

    Update changelog for last fix

commit d4ce3ad19b59b9c6d68f71d90e32dbb98d69d368
Author: Loïc Minier <lool at dooz.org>
Date:   Fri Aug 27 01:38:12 2010 +0200

    Pass -marmv7-a for the NEON flavor if needed
    
    Pass -marmv7-a for the NEON flavor if needed, don't check for v6t2.

commit 29726cd7456810b390d387cad17a404fa2460c52
Author: Loïc Minier <lool at dooz.org>
Date:   Fri Aug 27 01:24:43 2010 +0200

    Initial 4:0.5.2-4 changelog to fix a bug id

commit 6f4a84a379cb1fdff31ed2ffe433732f928b3e2b
Author: Loïc Minier <lool at dooz.org>
Date:   Fri Aug 27 01:20:34 2010 +0200

    confflags: detect armv6t2 support; closes: #594093
    
    debian/confflags: detect whether the toolchain supports armv6t2 ("ubfx")
    by default as that's now needed for the NEON pass; if it's not enabled by
    default, pass -marmv7-a in extra-cflags for the NEON pass since NEON
    implies ARMv7; closes: #594093.

commit 898820f21f6e25e71d9effb059183e0c2f275ff5
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Aug 7 09:47:56 2010 -0400

    Move breaks declaration from libavformat to libavcodec to help the apt solver, Closes: #591881

commit dd791c599049d47029298a05d1e69174b383f694
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Aug 7 09:48:29 2010 -0400

    prepare new upload

commit e783273b40a332aef3dbaec6e2f254106e47a968
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Aug 7 09:46:50 2010 -0400

    Move breaks declaration from libavformat to libavcodec to help the apt solver, Closes: #591881

commit d59b0872f28f012d27433574fd01087390ac55a4
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Aug 5 13:46:32 2010 -0400

    update debian/changelog

commit cc8593a77e2143e5e7a9a99b0bfe43261610239f
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Aug 5 13:45:17 2010 -0400

    bump standards version

commit cce46b27f5ec86425cc2235259739255d9201109
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Aug 5 12:03:08 2010 -0400

    more elaborate debian/changelog

commit fe6d3934fd374b69a417c5501418a04399c7d5c0
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Aug 5 09:54:33 2010 -0400

    update debian/changelog

commit 0f5949ee36e7544fb2bad45e6376dee339b9eaf3
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Aug 5 09:54:01 2010 -0400

    Enable all encoders, Closes: #418231, #433287, #440216

commit 903364855f7c2a19a06636b06e74c4ba48e265fc
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Aug 1 14:41:16 2010 -0400

    remove notes about stripping encoders, we ship uncrippled packages now in main

commit 02e80f5fa58b64a99488580e25c29327174376d6
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Aug 1 14:34:02 2010 -0400

    disable AAC decoder and encoder on ia64
    
    for mysterical reasons, the aac decoder seem to cause the bss segment
    to grow to big on ia64, disable it until the toolchain gets fixed

commit de714ce23a36ea09226a844a6ba9d286ee51d337
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Aug 1 14:31:37 2010 -0400

    no longer disable encoders

commit d6188de002e483f085546eaf5d770c74f78be57c
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jul 31 21:10:22 2010 -0400

    fix dependency on libswscale-extra-0

commit ee71676b910be02cfc7b0fefa4c3767aa2be18ec
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jul 31 16:29:15 2010 -0400

    cleanup confflags handling for 'soft' optional dependencies

commit 24f02e42951e14a13d1a5ce66eb2cfed225dba8b
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jul 31 16:27:30 2010 -0400

    weaken internal shlibs dependencies on -extra- packages

commit f982e8071a608d27dcffb00792650259dbaf1d70
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jul 31 16:15:17 2010 -0400

    Debian specific hack to unbreak c++ applications naively including FFmpeg headers

commit 6109470210ebfab6c69274d1d8dabf50c3ce1898
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jul 31 16:06:33 2010 -0400

    prepare new upload

commit 1ef82ae99c601a65dc69a8735b74d975536bab43
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jul 11 20:41:26 2010 -0400

    update debian/changelog

commit 2b20f494ef84389b6079ece0327261dce08802e0
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jul 11 20:40:55 2010 -0400

    weaken the dependencies for the -extra package
    
    In reality, the ffmpeg-extra package is likely to hang a bit behind the
    ffmpeg 'master' package. Since there is actually no real justification
    for this dependency to be that strict, let's loosen it until we actually
    find problems that are caused by this.

commit 9d8a61a90e5e92d3efa4de7ee97506016c167969
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jul 11 20:38:33 2010 -0400

    prepare new upload

commit e4a240dd3c5eb857169bd88fb64a772f2f8bea04
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jul 11 11:48:43 2010 -0400

    update debian/changelog

commit 64f7fb2acba2431118ae8e9561cd9690573271e7
Merge: 5a3c444 66ae34b
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jul 11 11:47:57 2010 -0400

    Merge branch 'ubuntu' into ubuntu.extra
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/rules

commit 66ae34ba3cdbc63384c77417e1f845fc7f1945b6
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jul 11 11:03:06 2010 -0400

    update debian/changelog

commit 372d3d3267345a11e3cfc4fdd744276de4e91a55
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jul 11 11:02:48 2010 -0400

    make rtmp dependency conditional
    
    librtmp is in universe only, so we can only enable it for the
    ffmpeg-extra package.

commit f9cc4286d02880d38c3d16c73bcfe9235308102a
Merge: b5b1638 02efbd1
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

commit 2b210afa0b88785c8bb11eeb985bea0a09e69818
Merge: 385ee3b 02efbd1
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Fri Jul 2 16:14:31 2010 +0200

    Merge branch 'master.snapshot' of git+ssh://git.debian.org/git/pkg-multimedia/ffmpeg into master.snapshot

commit 385ee3b0cf92bb86cb71f380fdf829773d89b3f6
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Fri Jul 2 16:12:12 2010 +0200

    Correct grammar error in README.Debian (Closes: #587898), thanks jidanni.

commit 02efbd15cbb0fd543a08b1868a010d3a5bbe7ba3
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jun 29 14:40:13 2010 +0200

    remove libgnutls-dev build dependency
    
    librtmp-dev has added libgnutls-dev to depends as of version 2.2e-4

commit 0420a644ca05ff98e9ed489a139ac9e68c83e92d
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Tue Jun 29 14:32:55 2010 +0200

    Tighten shlibs version to actually point to packages after the release.

commit 6519df1dad86c394bfa83ac63fc3754c1e3d39ae
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jun 29 10:25:35 2010 +0200

    update lintian overrides for shlib-with-non-pic-code (again)

commit 954f19598c736e041bd53bfb317205d8fef41c58
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jun 29 10:08:40 2010 +0200

    tighten shlibs version a bit, now that 0.6 is officially out

commit 97a7b54ae3b449703338f2b14bf344721f19635c
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jun 29 10:06:53 2010 +0200

    update lintian overrides for shlib-with-non-pic-code

commit e68ffad7395c19131e1ea42368bb9ecf6e1aaa76
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jun 29 09:45:20 2010 +0200

    librtmp-dev requires libgnutls-dev to be installed
    
    workaround until librtmp-dev adds this as dependency

commit 19045e8226245637da2c8c40a3314bd9687246d2
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jun 29 09:37:55 2010 +0200

    use source format 1.0 explicitly

commit 081dbd2f86ec42195125311041ee92c99d7964da
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jun 29 09:08:58 2010 +0200

    update debian/changelog

commit 6d3d7fb4a762717c29c469fbcc1e970f6dd3d47d
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jun 29 09:07:04 2010 +0200

    bump Standards-Version, no changes needed

commit 6af547cc4db57ed13713673148fb58809d4d4d12
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jun 29 09:04:43 2010 +0200

    Backport-AAC-HE-v2
    
    This patch is currently under consideration for the 0.6.1 release

commit e0c37878969a458fd81265d3dca054f4d50e35bb
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Jun 28 23:15:46 2010 +0200

    Add VP80 fourcc to libavformat/riff.c

commit c2b78bd71f3d31fd6f6de4e2a18b87aa38f3bf63
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Jun 28 23:00:48 2010 +0200

    make debian/patches gbp-pq friendly

commit 7cf7ddbf288fa2b7bbd63af80a38ea34b50faa7c
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Jun 25 23:39:00 2010 +0200

    add proper replaces for moving presets back to ffmpeg

commit 91676c4e1600255c91c066f256d0074064b87f9a
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Jun 25 23:33:46 2010 +0200

    update dep3 headers for debian/patches/900_doxyfile

commit c04f7cda5f4379111fa698c01777a8880a3fe21a
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Jun 25 23:33:29 2010 +0200

    fix usage documentation in debian/get-orig-source.sh

commit 6040878fddaa2a5224b90ce49299430f0dfe4233
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Jun 25 23:32:34 2010 +0200

    update upstream url in debian/copyright

commit 78278eda5757e92b9e4ec40276fe218bab79a0c8
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Jun 25 23:31:15 2010 +0200

    conditionally build against opencore-amr if installed in the build environment

commit 2ea41b193dc63c70f0ec842e00a286626ffb3d2e
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Jun 25 23:30:42 2010 +0200

    enable runtime-cpudetect

commit 45b69093f2efa51f27ae4cb4a6cdb6be08b5e583
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Tue Jun 22 08:57:57 2010 +0200

    Remove obsoleted support for the non-free libamr-nb/wb.

commit d5506bd795f50fa4cafc27741baac4fe1689d808
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Tue Jun 22 08:55:39 2010 +0200

    Revert "Add conditional support for AMR-NB/WB de/encoding via libopencore-amrnb/amrwb."
    
    This reverts commit 4bf25244468404e6d18a44fde53ef814ca727a2d.
    
    Most of this has already been implemented (slightly differently) in the ubuntu branch. :/

commit 4bf25244468404e6d18a44fde53ef814ca727a2d
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Mon Jun 21 17:12:56 2010 +0200

    Add conditional support for AMR-NB/WB de/encoding via libopencore-amrnb/amrwb.
    
    Introduce another cond_enable_version3 check, as both libraries require the ffmpeg license to change to (L)GPL3. Also remove confflags for the now unsupported libamrnb/libamrwb libraries, remove duplicate confflags and move libfaad confflag to the others targeted at ubuntu/multiverse.

commit 7d83e82e2873d87db3987ebbf57fe24bf3ffd580
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Mon Jun 21 14:22:12 2010 +0200

    Merge debian/README.Source into debian/README.source and add section headers.

commit 78672dca8b70c55841f695ed051adcf24b2bc596
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Mon Jun 21 10:02:47 2010 +0200

    Fix obsolete-relation-form for the internal dependencies.

commit 7c7b17c283201068efe9d69a1edde5df8e100059
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Fri Jun 18 09:50:08 2010 +0200

    Disable aac encoder, see README.Debian.

commit decb40dee740775ffe577f5da65d34dcd3562240
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Thu Jun 17 13:40:02 2010 +0200

    Enable RTMP[E] support via librtmp.

commit 5a3c444e7ebff511efa7dd2993b1979b144c8450
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Jun 16 13:04:31 2010 +0200

    update changelog for '-extra' variant

commit 7b9de05a33b7628863ebb6851976d734a995eed6
Merge: b4fcfeb b5b1638
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Jun 16 13:03:08 2010 +0200

    Merge branch 'ubuntu' into ubuntu.extra
    
    Conflicts:
    	debian/changelog
    	debian/control

commit b5b1638fc95c0ff0a35838e373488927a198047a
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Jun 16 12:57:50 2010 +0200

    changelog entry for upload to ubuntu

commit 64359aa71b8d371306e8d64065d11f9b63fa0687
Merge: 497b3ec 9b2a810
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Jun 16 12:53:02 2010 +0200

    Merge branch 'master.snapshot' into ubuntu
    
    Conflicts:
    	debian/changelog

commit 9b2a810778aa0328798e491f59a613d7bdb18456
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Jun 16 09:44:47 2010 +0200

    remove SVN_VERSION check from debian/rules for release tarballs

commit 670bddd39347e89d4ca1a2de891c50293e9cd03b
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Jun 16 09:33:10 2010 +0200

    update debian/changelog

commit 11cd6366021abcf356a9bbf931d7d996116f243b
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Jun 16 09:31:58 2010 +0200

    add VP8 support via libvpx (Closes: #582274)

commit d01595235b38dad15704a0c0f36642f05aa9b3f8
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Jun 16 09:28:50 2010 +0200

    add conflicts to the ffprobe package, it has been merged upstream now

commit 3752e68247031fe130f6a798afdf214f5a742298
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Jun 16 09:27:47 2010 +0200

    depend on libavfilter-extra-1 instead of -0, Closes: #583728
    
    thanks to Anders Kaseorg <andersk at MIT.EDU> for the patch

commit f1adda779f62861437b280419655ac4b585076fb
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Jun 16 09:25:34 2010 +0200

    start new upload

commit 896cc3b084dffdcd8c5ae02f5e0894cb9a1b8fbc
Merge: c68a044 096b014
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Jun 16 09:24:38 2010 +0200

    Merge commit 'upstream/0.6' into master.snapshot

commit 096b0149ec078ab41ebec75824e4c97f72d2be03
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Jun 16 09:24:12 2010 +0200

    Imported Upstream version 4:0.6

commit b4fcfeb4e5f82cb38fb044849bb58325ccf5de88
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Jun 3 22:08:55 2010 +0200

    update debian/changelog

commit 85c1304c77f87d51e13fa004ad57cddf0b1b4212
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Jun 3 22:08:33 2010 +0200

    install files into libavfilter-extra-1.install. LP: #587424

commit 4d0dd689bb1cf2c2604730df3d111de200215321
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Jun 3 14:08:37 2010 +0200

    fix debian/control file

commit 82e4e6f7cabdddab644042fba710d08cd1da794c
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Jun 3 13:33:35 2010 +0200

    add proper replaces for ffpresets move

commit 497b3ec0c8e66235bd706aeddf7ee6d9ef8f818d
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Jun 3 12:40:57 2010 +0200

    update debian/changelog

commit e7b7b5de6ee54588d7130628cc98a1f9374a972e
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Jun 3 11:31:50 2010 +0200

    fix typo in dependency on libavfilter-extra-1. LP: #587431

commit 0819f778e886548776499e40fe18d3597f5f6981
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Jun 3 11:30:17 2010 +0200

    add proper replaces, fixes: LP: #587369

commit e079563ddde68aabceb9a9433f2d7805e78f146b
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Jun 3 12:31:00 2010 +0200

    finalize debian/changelog

commit 4d7a9f5d9d5a736db8e9f8d3873f2696002aad97
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Jun 3 11:56:53 2010 +0200

    fix installation rule, LP: #587424

commit 34dc2bf7a9e288fca2c6c9f198c0655fa8ce084e
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Jun 3 11:41:09 2010 +0200

    bump soname for package libavutil49->libavutil50

commit 4d43d70fa38dec6e5a9c9fa214503cae3578baf3
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Jun 3 11:43:01 2010 +0200

    prepare new upload

commit 17aea35641e0f3c5d76fe79034f410835237f4c7
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Jun 3 11:33:38 2010 +0200

    prepare new upload

commit 7130f939bdb60269a144e1fae75abac4cf03ca91
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Jun 3 11:21:22 2010 +0200

    fix upload target

commit c418284b462bf22267c2539ddfa02c0b735cce21
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Wed Jun 2 10:23:26 2010 +0200

    Update debian/changelog.

commit 6e1151dc12f3607e61dec01fc86bf1f4e20ed0ba
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Wed Jun 2 10:12:36 2010 +0200

    Remove fix-ftbfs-altivec.patch, applied upstream.

commit 0f33340982dad9684cdf052c3c0dc184d069bd63
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Wed Jun 2 10:10:22 2010 +0200

    Remove ffmpeg-debian_hurd.patch, applied upstream.

commit 197467438f74a427c13c0e1c32cba441ff29c348
Merge: 21da6f2 1607b50
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Wed Jun 2 10:03:32 2010 +0200

    Merge commit 'upstream/0.5.2'

commit 1607b50189036f70d450b9981342f484bdc2c4af
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Wed Jun 2 10:03:26 2010 +0200

    Imported Upstream version 0.5.2

commit c68a0445bc7200b5a16f177e1eb19dbc506c7358
Author: Konstantin Pavlov <thresh at altlinux.org>
Date:   Tue Jun 1 23:34:52 2010 +0200

    Enable VAAPI support by means of libva-dev

commit ae7d302528f11427616679b819f06c8d1aeaafcb
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri May 28 15:09:29 2010 +0200

    remove all install rules that are related to non-library packages

commit fef867a9857688f9648dcbc5009ecabce887dd2c
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri May 28 13:34:07 2010 +0200

    update changelog

commit 55e302908b4eac9d183d66067bfea1aae618b2c8
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri May 28 13:33:49 2010 +0200

    don't try install html files, we don't build ffmpeg-doc in ffmpeg-extra

commit 76741c5c02a846ed3cdc6197e2accb9664ad7962
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri May 28 13:33:42 2010 +0200

    prepare new upload

commit 60871b8a797b75dab5005645570a43e47cfff7be
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed May 26 08:06:10 2010 +0200

    remove install commands for packages that do not exist in this package flavor

commit 09d63a8f6048d3e84f0df785ea62658ec2d2c192
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed May 26 07:50:31 2010 +0200

    don't install presets in avcodec package, see: #581748

commit 866797b819ebb03ada0ca5b86d65502ea81a6cad
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed May 26 07:49:37 2010 +0200

    update debian/changelog

commit 72cd8e62204323c9fd68ec9bd399f5d1fb0b5cb8
Merge: 4c5da39 136c6e1
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed May 26 07:48:34 2010 +0200

    Merge branch 'master.extra' into ubuntu.extra
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/gbp.conf

commit 4c5da39844bb19297e71f0af7746a2dea2d4b073
Merge: c07755c b3122e8
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed May 26 07:45:56 2010 +0200

    Merge branch 'ubuntu' into ubuntu.extra
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/gbp.conf
    	debian/rules

commit b3122e8a49917c1ec992b5e56716a4ed11b8418e
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed May 26 00:02:26 2010 +0200

    prepare new upload

commit 8d4c93eb2f1a1c416534ef3fbf535a9a274385c5
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue May 18 11:07:43 2010 +0200

    move presets back to 'ffmpeg' package. Closes #581748
    
    The problem is more serious at it seems. Leaving the presets in
    /usr/share/ffmpeg will cause file conflicts on the next SONAME bump. brr.
    
    This fix is actually more complicated as it seems. I proposed to change
    the installation directory to include the soname change. Hower, it did
    not receive good reception upstream:
    
    http://comments.gmane.org/gmane.comp.video.ffmpeg.devel/109433
    
    In the end, moving it back to the ffmpeg package seems to be the least
    evil here.

commit a66a0efaa78617743e46fb3738f1416e85566adf
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue May 25 23:47:02 2010 +0200

    revert debian/rules to version in debian

commit cad44428268f0e28c98654f7c5f099ce9c86bcca
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue May 25 23:43:18 2010 +0200

    remove superflous quilt patches

commit f56684fa9ea1d40cadeb7d4477d1cdc77a3b8384
Merge: 0516a90 a92e3a9
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue May 25 23:42:03 2010 +0200

    Merge branch 'master.snapshot' into ubuntu
    
    Conflicts:
    	debian/changelog
    	debian/confflags
    	debian/gbp.conf
    	debian/patches/fix-dv-seeking.patch
    	debian/patches/series
    	debian/rules

commit 0516a901257155e9e0dc0230225052d8d29ae642
Merge: 22bb75b d3f7467
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue May 25 23:36:06 2010 +0200

    Merge commit 'd3f74677778f2d0615307ebe0d3efb0650c23a53' into ubuntu

commit d3f74677778f2d0615307ebe0d3efb0650c23a53
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue May 25 23:34:54 2010 +0200

    Revert "Imported Upstream version 0.5.1"
    
    this is an auxilleray change to avoid merge conflicts when merging the
    snapshot branch.
    
    This reverts commit d32680f2fa9f48bcf321cd4619bbca787a534731.

commit 21da6f23f87fa9e680bd71b7be4759a1d8212b89
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue May 25 23:01:14 2010 +0200

    update debian/changelog

commit 4f58b031aef85e5f3a0dfac12bbbf1d3ca9bb548
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue May 18 11:07:43 2010 +0200

    move presets back to 'ffmpeg' package. Closes #581748
    
    The problem is more serious at it seems. Leaving the presets in
    /usr/share/ffmpeg will cause file conflicts on the next SONAME bump. brr.
    
    This fix is actually more complicated as it seems. I proposed to change
    the installation directory to include the soname change. Hower, it did
    not receive good reception upstream:
    
    http://comments.gmane.org/gmane.comp.video.ffmpeg.devel/109433
    
    In the end, moving it back to the ffmpeg package seems to be the least
    evil here.

commit 44de5d2680313a640f10cb7dab875f7d4c630fd1
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Tue May 11 01:38:12 2010 -0400

    Update overrides for new libavcodec52 libraries.

commit 20886cd877ec03545b7a0888be791828fddd9377
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Tue May 11 01:37:05 2010 -0400

    Bumpt to Standards-Version 3.8.4

commit a92e3a9b1c868367ec6f1e06bb08b88f2ea0e6b9
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun May 9 22:22:33 2010 +0200

    bump shlibs

commit 7e4b2ade82e1672279540f01b1105fc49365378d
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun May 9 22:21:41 2010 +0200

    update debian/changelog

commit 070b4f8814addceec3af9104732b01e6e990dbdf
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun May 9 21:57:11 2010 +0200

    remove spurious .pc/ directory

commit 81c299a45ae49fe1acd96907c81b2b66af2e922f
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Sat May 8 03:34:09 2010 -0400

    Fix dependency problem for ffmpeg binary package when using extra ffmpeg libs.
    This will still leave problem with ffmpeg-dbg, but the debug package will be
    useless anyway when using extra ffmpeg libs.

commit 136c6e12858047d734a0f9d242bfe83c9060bd41
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Sat May 8 02:56:20 2010 -0400

    Update changelog.

commit 1f74008f09e0ca5a883c7097efd0de39a32a1de1
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Sat May 8 02:48:37 2010 -0400

    Place ffmpeg-extra back in main.

commit db06836be8fe18b2108e29eb12c2739dbe67a24d
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed May 5 22:24:50 2010 +0200

    Bump Standards-Version to 3.8.4

commit 2bc03e194716423e36fef614bf029f509cae91b6
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed May 5 22:17:33 2010 +0200

    fixup lintian warnings for new upstream snapshot

commit 5d216315408a8264ebe2f93afb4ae615c3384518
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed May 5 22:02:35 2010 +0200

    prepare changelog for new upload

commit adecc00120f62cf2214e34ac27f6b24360c6fa78
Merge: f371979 a0b417d
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed May 5 22:01:49 2010 +0200

    Merge commit 'upstream/0.6.svn20100505' into master.snapshot

commit a0b417db5a0b6487fc161e29f4c466a6d512d7e0
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed May 5 22:01:37 2010 +0200

    Imported Upstream version 0.6~svn20100505

commit f371979caeb88e147749e4c6ae7899bd266a5d76
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed May 5 21:59:11 2010 +0200

    Add a tad more infromation what this script is doing

commit 45fbfefc6631ea21c8e5b4d654cc596f327719f0
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed May 5 21:56:57 2010 +0200

    track 0.6 release branch (not released yet!)

commit fe218d7bbf90a9803802368a6ad6e5d284c8b52a
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Tue May 4 01:30:55 2010 -0400

    Renable texi2html for docs.

commit e7b5f2d4677e8dd77df717e431efc9c48d2f9926
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Tue May 4 01:16:21 2010 -0400

    Place this package in non-free.

commit 46d2377d061d40c3cd600749bd082deb2069278c
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Tue May 4 01:08:48 2010 -0400

    Don't build-depend on texi2html to skip building documentation.

commit 88d1ed8750b25297aabd17cc04dd2826346189c7
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Tue May 4 01:08:14 2010 -0400

    Set the team as maintainers.

commit 69d12939232507bbd266fa9e5905b7f30cc3ba9e
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Tue May 4 01:07:01 2010 -0400

    Include ${misc:Depends} for all packages.

commit 5f650f4523aae68e560d04dba75ebff34d8b6749
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Tue May 4 01:05:14 2010 -0400

    Don't include build-depends-indep when only building arch-dependent packages.

commit 4c4f97a95392e9574d725266cf3599448bdb3828
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Tue May 4 01:04:44 2010 -0400

    Bump Standards-Version to 3.8.4.

commit ce80e31cdda5b1ccee4e10b5133d89bc9c4c4972
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Tue May 4 01:04:19 2010 -0400

    Prepare for new release.

commit a60aefa0620273a6b73f930505880d5a8f165468
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Tue May 4 01:00:16 2010 -0400

    Update gbp.conf for master.extra branch.

commit 5652487574704510ea509ad8cb8cde9723c2582f
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Mar 12 21:47:17 2010 +0100

    new upload

commit 257921a5ff7708c1012c2c0c0ad32ba1a9c558f2
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Mar 12 21:42:15 2010 +0100

    fix ftbfs on powerpc

commit 7907f257640c26de5d78a15f23a1acb3dd106579
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Mar 10 22:10:26 2010 +0100

    finalize debian/changelog

commit 9c415b92c1c4d235369c57a1cbd5f0f06e5c096d
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Mar 10 22:02:48 2010 +0100

    Fix compilation on powerpc with --disable-altivec
    
    in case altivec is disabled, even compilation of code using altivec
    keywords or asm must be avoided.

commit 7e110dbfa1d99175ef458a28c4d8f4e103a2e86f
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Mar 10 21:32:12 2010 +0100

    reintroduce gnu/hurd patch

commit 1d5dc65b1106668ccc485977bf912f725e17b34d
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Mar 10 21:19:46 2010 +0100

    prepare new upload

commit c07755ca8130b9fd733a68c05617667448ac52ef
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Mar 4 13:02:45 2010 +0100

    prepre new upload

commit f0557d7021f91a0361e1110081dec5d5c321afac
Merge: 637ab2f 22bb75b
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Mar 4 12:57:52 2010 +0100

    Merge branch 'ubuntu' into ubuntu.extra
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/gbp.conf
    	debian/rules

commit 22bb75bdaeb647783638f439c4ba5124168ca476
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Mar 4 12:54:56 2010 +0100

    prepare upload for ubuntu

commit 25418cc5199b510fe137a9f2f9da57f6ce0894da
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Mar 4 10:37:39 2010 +0100

    drop x264 backport, included in 0.5.1

commit 6aa1b4c46a2ee721de3910af6e13a881839acc60
Merge: af14678 5aadb61
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Mar 4 10:34:30 2010 +0100

    Merge branch 'master' into ubuntu
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/gbp.conf

commit 5aadb6168a757fff1166e40724e8f550c71bedc9
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Mar 4 10:15:34 2010 +0100

    bump shlibs for av_lock_mgr() addition to libavcodec

commit ef11c38f6872dc951dce7bd445c3786c57a8a298
Merge: b1a4cc4 d31bcc4
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Mar 3 22:32:10 2010 +0100

    Merge remote branch 'origin/master'

commit b1a4cc4e36a5661a4a99b61896f7f4654a18999c
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Mar 3 22:28:37 2010 +0100

    update debian/changelog

commit ba23c23d7a381a9560bb3f6d6433ea696a73f3b7
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Mar 3 22:04:16 2010 +0100

    drop wmapro backport again
    
    as discussed with upstream, this patch does many other changes to the
    existing wma decoders. As nobody is really willing to review these
    changes, let's better work on getting an updated snapshot into experimental

commit 4c454aa925c7fa7a28df871aacaf7c7f807700a7
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Mar 3 21:56:17 2010 +0100

    merge changes from ubuntu packaging
    
     - allow building against opencore-amr if installed
     - install presets in 'libavcodec' instead of 'ffmpeg'

commit a36c64b1cc56ee2bbb213df514f832de262d0486
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Mar 3 21:24:11 2010 +0100

    use '<<' instead of '<' relationship for internal shlib file

commit f97d72cb05497e6e3443eb5d5e47205001e65fae
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Mar 3 21:03:54 2010 +0100

    adapt to new versioning scheme
    
    as this upload is not based on a svn checkout but on the release
    tarball, these adaption do not rely anymore on the variable SVN_VERSION
    nor on the file .svnrevision

commit d1c4d8bee71333d014292e012251cb0f66357978
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Mar 3 10:52:03 2010 +0100

    remove patches that got merged into 0.5.1

commit 6f9db1c49c88531337414f78b192756ef939754b
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Mar 3 10:52:24 2010 +0100

    prepare new upload

commit f86fb0d11093032e2a383b603d641e0bef74d576
Merge: 3ab91e8 d32680f
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Mar 3 10:46:14 2010 +0100

    Merge commit 'upstream/0.5.1'

commit d32680f2fa9f48bcf321cd4619bbca787a534731
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Mar 3 10:46:11 2010 +0100

    Imported Upstream version 0.5.1

commit 3ab91e8908ffe65c2e386094c8734ed776e1d9f8
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Mar 3 10:44:54 2010 +0100

    track upstream-0.5 branch
    
    the 'upstream' branch has already started to track trunk again, but we
    are working on the 0.5.1 point release

commit 637ab2f9cda5c15f0d7669c8038ef6a04cf55e77
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Feb 18 00:09:09 2010 +0100

    restore removed changelog entries

commit 8b973a6856306b641def047fe8ee476d8c7c9451
Merge: b68c55b af14678
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Feb 18 00:06:18 2010 +0100

    add replaces field on ffmpeg, as we are taking over the presets files

commit af146785b59031e45a557853dfdd6b306a8a6ed6
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Feb 18 00:02:56 2010 +0100

    add replaces field on ffmpeg, as we are taking over the presets files

commit b68c55bfa9e59104620a6d31843516e5ede6cf68
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Feb 17 09:08:35 2010 +0100

    update debian/changelog

commit 20effad98bc0bbc44ba793bc471db60226a65733
Merge: 6a96ad4 b55f044
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Feb 17 09:02:27 2010 +0100

    Merge branch 'ubuntu' into ubuntu.extra
    
    install presets in libavcodec-extra package

commit 6a96ad42ee8ba6045c3d87e1d377d2b4b51f3092
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Feb 17 08:55:06 2010 +0100

    prepare new upload

commit b55f04465acf11f5bb2b66e1ffc0cb3e072bdaa8
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Feb 17 08:53:59 2010 +0100

    update debian/changelog

commit 998e863a6369838c82d60edb02aa80984197045b
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Feb 17 08:47:38 2010 +0100

    install presets in 'libavcodec package' instead of 'ffmpeg' binary
    
    the presets are mainly used to parametrize codecs, which are specific to
    the libavcodec build. With the planned x264 backport, we need to ensure
    consistency between the presets and avcodec. moving presets into
    libavcodec costs a bit additional mirror space, but ensures consistency.

commit d4e6ef10bce89070a9a05bb4fe15febf7ac89e6d
Merge: 9f59056 3984436
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Feb 17 08:42:31 2010 +0100

    Merge branch 'ubuntu.extra' into ubuntu
    
    add x264 backport patch

commit 9f59056eeed6f3fdc803bd4ad2f479879fe45ae0
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Feb 17 08:37:21 2010 +0100

    prepare new upload

commit 39844363273d28302867d1f75c4d39e78a540932
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Feb 14 22:03:16 2010 +0100

    prepare next upload

commit 487bc4d4feb27db74ebc70ddd74355499cb371d9
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Feb 14 22:03:04 2010 +0100

    19:49:28 < Honoome> the configure is checking the symbol, not the definition, I guess
    19:49:31 <@Dark_Shikari> s/x264_encoder_open/x264_encoder_encode in configure
    19:49:35 <@Dark_Shikari> that will fix it

commit 89706fa63d7bc10eee27a3b7c173e816f78c6ab3
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Feb 14 16:20:25 2010 +0100

    update changelog

commit 29338f481c988522494dd95b8aec93f3920f9566
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Feb 14 16:17:06 2010 +0100

    add x264 backport for ffmpeg 0.5

commit 031a14e879a97bd0135fd03470ae97e7511f03e3
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Feb 14 16:13:58 2010 +0100

    tighten build dependency on new x264 package

commit cd28c6dc2c347df6dbbe0dd4b6683bfd8cd997b2
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Feb 6 15:35:37 2010 +0100

    update url

commit d31bcc468df78cdacaf4fdfc02759c67c690479d
Author: Fabian Greffrath <fabian at debian-unofficial.org>
Date:   Wed Feb 3 11:15:02 2010 +0100

    Adjust the previous changelog entry to include a lost commit.

commit 03cb5ee84e1592e2a0fe9783f22afccf5f3475ad
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Feb 3 08:11:08 2010 +0100

    update copyright dates

commit c5308d79e4d36aed2661d293baa1be9b06b1dd7c
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Feb 3 08:10:47 2010 +0100

    fix usage help

commit 5a0484b013b04681e66c15fc98ec95dfeb2b168f
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Feb 1 23:23:54 2010 +0100

    mark MMX runtime check backports as submitted for 0.5

commit 42cb9e6b1e06b8aeab1b21f56e5480df616d7123
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Feb 1 23:21:30 2010 +0100

    update patch header for symbol versioning patch

commit 37e1a0d7fdf8f611337f9f525d95deb85fd893ca
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Feb 1 23:19:03 2010 +0100

    note kfreebsd patch as forwarded

commit 9e0a8e31fc3fd4d3eff77f58a913fb75c9908ffa
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Feb 1 23:14:49 2010 +0100

    note bug as forwarded

commit 611118dc1b9729b63daa856928d96c7674ef7a8f
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Feb 1 23:09:11 2010 +0100

    drop debian/patches/ffmpeg-debian_hurd.patch
    
    dv1394 is disabled by default, and the switch gets set on architectures
    running linux kernels only. See upstream thread for a discussion of this
    patch: http://permalink.gmane.org/gmane.comp.video.ffmpeg.devel/103700

commit e11ad5052e7f596b4a0ee1ab82bdb23409b37101
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Feb 1 13:35:02 2010 +0100

    backport libswscale CONFIG_RUNTIME_CPUDETECT related change to libswscale
    
    without this patch, the previous patch might not be effective

commit 12bd1f025ae44f9b1cbd4db15bd4de12b846614e
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Feb 1 13:33:35 2010 +0100

    start new upload

commit 46262937882f941a0269c18bcdcdef01e5b5ccdb
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jan 31 20:02:12 2010 +0100

    enable cpu runtime detection

commit 6bca5a6be439a3a5b461ce8117824becac1b49be
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jan 31 20:00:20 2010 +0100

    Revert "enable cpu autodetection in libswscale, Closes: #567725. LP: #386397"
    
    No longer necessary with backported patch.
    
    This reverts commit cf5a7e07c9d6fe668bb8276b49788a7b5ee68407.

commit e290c98ec111e59ef51a033bacff0c750be7bd11
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jan 31 20:00:10 2010 +0100

    backport patch from trunk for adding cpu runtime detection

commit 25a919d862986afa453d836b26b7755a49a7d359
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jan 31 19:43:20 2010 +0100

    update debian/changelog

commit cf5a7e07c9d6fe668bb8276b49788a7b5ee68407
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jan 31 19:42:03 2010 +0100

    enable cpu autodetection in libswscale, Closes: #567725. LP: #386397
    
    this hack is required because ffmpeg's configure does not set this in
    0.5. It is however in use by mplayer's configure script. As suggested by
    Raimar Döffinger, this gets now hardcoded in the generated config.h

commit 6ba7a5ab1a458a38024ff4175455f7b7e2357a4b
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jan 31 17:09:41 2010 +0100

    update debian/changelog

commit 6d45c8bb177f5a47f0b3a84ae664113fc47bdbb7
Author: Christopher Martin <chrsmrtn at debian.org>
Date:   Sun Jan 31 16:54:43 2010 +0100

    backport wmapro codec from ffmpeg trunk

commit 59ae4bf7b33b018a08e674d6f76e964d6ac96130
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jan 31 16:53:58 2010 +0100

    prepare new upload

commit 2212d29172c87c3c263b9e4f9370e1b4cfdd6c61
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jan 31 16:40:49 2010 +0100

    document some unattributed patches

commit c61bb2cf3a809f49ee1f94bb0e8a9f233dfb16e0
Author: Fabian Greffrath <fabian at debian-unofficial.org>
Date:   Thu Jan 28 10:39:09 2010 +0100

    debian/patches/901-fix-misc-typos.patch: New patch taken from upstream GIT (slightly modified) to fix some spelling errors.

commit 43f40482f9c351df0c7e2b50975b9740c000676b
Author: Fabian Greffrath <fabian at debian-unofficial.org>
Date:   Thu Jan 28 10:30:41 2010 +0100

    Document our calling of debhelper programs in an odd order in debian/rules.

commit 4d1c51176b040986e4fa7ea50182a4dd978be4d4
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Jan 25 15:14:54 2010 +0100

    snapshot_version needs to be placed at top level now

commit b53503bf2f75dd4121e926db501329934a318404
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Jan 25 14:17:22 2010 +0100

    install codecs.txt and formats.txt in correct packages
    
    upstream has split the output of -formats to include information about
    formats only. Additionally information about available codecs can be
    extracted with the parameter -codecs. Therefore introduce a file
    codecs.txt and install that instead of formats.txt into the libavcodec
    package.

commit 3c4d992a4a3c8c4316350e299f45dd6e73ac25af
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Jan 25 10:14:15 2010 +0100

    fix path to libavcodec API example

commit e99e78a899fe0c3aa3703270b8bf7e5601e6f0b5
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Jan 25 10:07:29 2010 +0100

    don't instal inexistant file RELEASE

commit 9bfb464ff8393658a640763a92720760524aba9c
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Jan 25 12:49:23 2010 +0100

    adjust lintian overrides for minor version bumps

commit 6b133d2f290bc631063fb89069b28c58ff4d4d74
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Jan 25 12:53:37 2010 +0100

    reflect SONAME changes for avutil and avfilter
    
    this snapshot introduces the SONAME (major) bumps:
    
     - libavutil49 -> libavutil50
     - libavfilter0->libavfilter1

commit 1757d3b16c8abe6f94f4ca12ca6399451dbf960b
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jan 24 21:50:01 2010 +0100

    remove confflags that no longer apply

commit 3afac7c472523daee41a3d9d2e308db6b41a3866
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jan 24 21:44:45 2010 +0100

    drop unnecessary patches
    
    this means nearly all, as our patches are (almost) all backported from
    trunk/

commit 6c7d3ab94b68aa0327051ca314c1f34a5cc0bc73
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jan 24 21:41:20 2010 +0100

    adjust regex for new versioning scheme

commit 12d0390f3d6cb5f23c2771daa130df1b8233a3ef
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jan 24 21:32:47 2010 +0100

    merge new upstream version

commit adc6cc458427a23f0d6711339352ae3b07c5c186
Merge: a05a339 4e56ddd
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jan 24 21:20:31 2010 +0100

    Merge branch 'upstream' into master.snapshot

commit 4e56ddddf82b029bf60d469f6f3152ac8c0f2b37
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jan 24 21:16:12 2010 +0100

    Imported Upstream version 0.6~~svn20100124

commit a05a33977d2eae999a06828327a753a795328fb6
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jan 24 21:16:08 2010 +0100

    simplify git-import-orig invocation

commit d025fec17ac27ef289f81527495479cf9cdf0134
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jan 24 21:12:52 2010 +0100

    use a tag name that actually works

commit 34ca624132fe0146a67200a60b98120a1a013ecc
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jan 24 21:01:41 2010 +0100

    track trunk and fetch externals

commit 34e6acf9352ca6031dc4d2821854242d8a1c6551
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jan 24 20:52:21 2010 +0100

    work in branch 'master.snapshot'

commit 4d02f941ed99a1e5e3402bc410734efff21a1421
Author: Lionel Le Folgoc <mrpouit at gmail.com>
Date:   Sun Jan 24 19:18:04 2010 +0100

    add auto-detection of libopencore-amr{n,w}b

commit 4bce4d7a14d6331ddaa1f4a05419679a3dcec16c
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jan 24 19:17:24 2010 +0100

    prepare new upload

commit a7c5fe6bc65166e6f9af384b266f28d380d56161
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jan 19 20:55:30 2010 +0100

    Imported Debian patch 0.5+svn20090706-5ubuntu3

commit 9f02f5594fe25fdda9e409f987841b3be2272db4
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Jan 22 16:09:47 2010 +0000

    update debian changelog

commit 6e95cd6c328e6945a94aa258c694ebd87c4d48e5
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jan 17 09:37:38 2010 +0100

    remove unused patch 'fix-theora-constant-quant-enc.patch'

commit c0a36432cf5f1a898209c021e3f757f45eb683a4
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jan 17 09:34:59 2010 +0100

    update debian/changelog

commit 325a204c0504ee2ca301b7d4cbea67499dd29300
Merge: f1db80b 047264a
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jan 17 09:34:12 2010 +0100

    Merge branch 'ubuntu' into ubuntu.extra

commit f1db80bda75c82a0faf3a9999687c874f08b0487
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jan 17 09:23:49 2010 +0100

    adapt debian/gbp.conf for new branch name

commit 047264a9a7bf1602f378a965ab3a77982354f6b3
Merge: 5a8466d 8842398
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jan 16 10:41:56 2010 +0100

    Merge branch 'master' into ubuntu

commit 884239855f6b325a9b1cf7771154e74293d40244
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jan 16 09:59:46 2010 +0100

    target unstable

commit 7e07d814b0d3bafae676f87ec511f5c4381d3dd0
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Jan 15 23:14:30 2010 +0100

    update debian/changelog

commit efaa86975774665c2b180617203c0aa328226cc1
Merge: a3662f6 5a8466d
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Jan 15 21:39:56 2010 +0100

    Merge branch 'ubuntu'
    
    Conflicts:
    	debian/changelog

commit a3662f6806d2020491cda2587a806074997f9947
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Jan 15 21:31:22 2010 +0100

    build with PIC on powerpc (Closes: #561956)
    
    remove now unnecessary extra -DPIC flags in debian/confflags, the patch
    is taking care of that now.

commit 5a8466d1451d378560dfba675a5cdaed093b1436
Author: Loïc Minier <lool at dooz.org>
Date:   Wed Jan 13 13:06:14 2010 +0100

    Close LP #488267

commit a2fdf96e43f182b63f89d007f6cb8c88ebae9ae4
Author: Loïc Minier <lool at dooz.org>
Date:   Wed Jan 13 13:01:53 2010 +0100

    Prepare changelog

commit 720e8058363c27cb3a6f1ad10cba11886cd3c769
Author: Loïc Minier <lool at dooz.org>
Date:   Wed Jan 13 12:54:13 2010 +0100

    Drop --disable/--enable opt flags on ARM
    
    Drop --disable/--enable opt flags such as --disable-neon or
    --enable-armvfp on ARM since the upstream configure script will do the
    right thing when the proper flags are set.

commit ea2d74ce433dd7882da1712a539afe2a5a9ca88f
Author: Loïc Minier <lool at dooz.org>
Date:   Wed Jan 13 12:23:35 2010 +0100

    Test whether to build neon and vfp flavors
    
    Build some assembly test code -- just like configure -- to decide
    whether the *default* toolchain uses vfp or neon to decided whether to
    build the vfp and neon flavors.

commit 6e9624b2c4386aa744282b511a0b37a19f5ab7a0
Author: Loïc Minier <lool at dooz.org>
Date:   Wed Jan 13 11:52:36 2010 +0100

    Drop --cpu on armel as the default is correct
    
    Drop --cpu on armel as the default is the toolchain configuration which
    is always correct on karmic/lucid/sid; internally, cpu will be set to
    "generic" but -march=generic or -mcpu=generic will NOT be added to the
    build flags.

commit eb8707fa36e123c7285dceda3d31b5759aa42a41
Author: Loïc Minier <lool at dooz.org>
Date:   Wed Jan 13 10:42:45 2010 +0100

    Update armel confflags on Ubuntu for lucid
    
    * Since Ubuntu lucid and later require v7 for Thumb 2, build all flavours
      for an armv7-a CPU, and the noopt flavour for a vfpv3-d16 FPU.
    * Build all armel flavours with -marm since ffmpeg has a lot of hand crafted
      assembly which doesn't build in the new lucid default mode (Thumb 2).
    * Build all armel flavours with -fPIC -DPIC instead of just the neon flavour
      as the new flags/toolchain are require this.

commit 198c37e877179bd7aef400b26290df7727f3e5c5
Author: Fabian Greffrath <fabian at debian-unofficial.org>
Date:   Mon Jan 11 16:57:02 2010 +0100

    Update my email address.

commit 18480ba295e827097da24a8ba38ce012b079b6e7
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Jan 11 12:36:09 2010 +0100

    Revert "Document the copyright notice and license for the VDPAU headers in debian/copyright."
    
    The header have now been removed, so no need to mention them anymore.
    This reverts commit 561ce0bdeafb222625889ea1bd3cb8905f29d006.

commit 5717192206f6aba44f833d6ee2c102fbf3276cd0
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jan 10 11:43:29 2010 +0100

    drop hacked in headers and depend on libvdpau-dev (Closes: #564413)
    
    since the libvdpau wrapper has now reached debian main, we no longer
    need to ship private copies of it.

commit 411fc952102d796ad10375eec452dc5e19622d40
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Jan 8 20:00:03 2010 +0100

    Use normal check_func test for math functions
    
    This patch avoid a funny FTBFS on armel machines that do not have a FPU.

commit 3080784a33a7af68ee61b32ccbd63a98e50170e1
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Jan 8 19:51:32 2010 +0100

    prepare new upload

commit b057096399e9447ffd17f3fe97a1718ecbe3d441
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Jan 6 18:45:18 2010 +0100

    update debian/changelog

commit 30e00bbe3bf5c623e183c8d0d209e9859fb3ca5e
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Jan 6 18:44:05 2010 +0100

    make sure the ${misc:Depends} substvar is used for each binary package
    
    according to http://lintian.debian.org/tags/debhelper-but-no-misc-depends.html, this
    seems to be the recommended practice for package that use debhelper.

commit e920409d11d55a2b83d263b33b00323b19446afe
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Jan 6 18:39:23 2010 +0100

    add README.source describing how this source package manages patches
    
    reported by lintian

commit ba2aa5cb153618a3692fab38b32add99ea5071f8
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Jan 6 17:42:02 2010 +0100

    update debian/changelog
    
    add bug number, and reformat comments on security backports

commit 8b886551655d11f07aa8fecb3ecbcb91f8a944af
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Jan 6 17:38:14 2010 +0100

    tighten internal dependencies
    
    because of the introduction of symbol versioning, the lower bound of the
    internal dependencies needs to be more strict.

commit 3ff341efd68fca1a191a62c4ac82aab3a06e31db
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Jan 6 17:30:09 2010 +0100

    bump shlibs version to a version that is actually in debian

commit 24615a25a9b6a22712a75674972d91bc5bc4ead2
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Jan 6 16:50:33 2010 +0100

    finalize debian/changelog

commit 70364033a625927080ee99012c9a539683e3b00a
Merge: c1bc30d bd46d37
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Jan 6 16:26:12 2010 +0100

    Merge branch 'ubuntu.lucid'

commit 06aa5737aadb14f0ad1fee92bf4bb070ab3e9023
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jan 2 23:48:17 2010 +0100

    prepare next upload

commit bd46d37b659b36c7b72abb378b29c871e7755ea2
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jan 2 23:38:02 2010 +0100

    prepare next upload

commit 0a0df0943d96f2ef356f72d63a898ecb2077cc0e
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jan 2 23:36:37 2010 +0100

    export *all* symbols of libswscale
    
    mplayer seems to use a *lot* of libswscale internals.

commit dc2273200105f227ae9bd0a6890c0501cd63f209
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jan 2 23:34:17 2010 +0100

    export *all* symbols of libswscale
    
    mplayer seems to use a *lot* of libswscale internals.

commit 0b0bb57892e293aeaf24bea147718eecc5914306
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jan 2 18:31:03 2010 +0100

    fix upload target

commit 680ba48798a94758c249e26387d47fdcccd2b5cf
Merge: 52f5e40 f8e7f5e
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jan 2 18:30:13 2010 +0100

    Merge branch 'ubuntu.lucid' into ubuntu.lucid.extra

commit f8e7f5ea959a11b6c5f6ec50584e85f857c2f491
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jan 2 15:04:22 2010 +0100

    finalize debian/changelog
    
    target this upload for motumedia ppa, where we will test rebuild a
    number of applications

commit 0a16d2a3300864b7c7d8cd5f10c1f58f99e58f4f
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jan 2 15:02:28 2010 +0100

    bump shlibs version
    
    introduction of symbol versioning needs to bump shlibs in order to
    prevent that applications that have picked up references to shared
    symbols can be installed with earlier versions of the ffmpeg libraries.

commit 7b8f3eb79ccbf249348cac2f303dc9be02e4d5c5
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jan 2 15:00:51 2010 +0100

    enable symbol versioning
    
    this is submitted preversion of the symbol versioning patch that is
    currently not applied yet. The current form does not consider non-gnu
    linkers yet. However on Linux, we don't support other linkers anyways.
    This way we can start the symbol versioning transition earlier.

commit ffb4e43841146d9bb9924a1a64da16e091604dcf
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jan 2 14:57:41 2010 +0100

    revert gbp.conf to point to lucid branch

commit 99677fc2a8d23d75d7a13c24a43f9f89e4fd3522
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jan 2 14:57:12 2010 +0100

    prepare new upload

commit ca5e8d041b2813c1fef4697c15966da4b27a5bb5
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Dec 21 23:57:34 2009 +0100

    Imported Debian patch 0.5+svn20090706-2ubuntu4

commit 52f5e4015ba06145ff9687d7e8a3f1f48e0812f8
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Nov 10 13:18:40 2009 +0100

    fix upload target

commit 2d0dcbb15ce92f3c8ff9e99692d2bc47df324e00
Merge: 228ed27 1680032
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Nov 10 13:17:19 2009 +0100

    Merge branch 'ubuntu.lucid' into ubuntu.lucid.extra

commit 16800321658ace446929f73b9a56d09c554a1be7
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Nov 5 20:36:41 2009 +0100

    update debian/changelog

commit 0caf2efa1f19eae86defe8fdf22e6081ec7a36b9
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Nov 5 20:26:44 2009 +0100

    this branch targets lucid, no longer karmic

commit 286aea7792f37e591ce4fdbc6af2e7f30b374019
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Nov 5 20:24:40 2009 +0100

    reorganize libavcodec/libavformat security patches
    
    create a new subdirectory per lib where the patch is applied to.

commit 6c370eb7bc85c5be62b3e0ee05479731b716b85e
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Oct 31 00:10:17 2009 +0100

    backport svn r18016 aka 'MOV-Support-stz2-Compact-Sample-Size-Box' to fix FTBFS
    
    without this patch, libavformat/mov.c won't compile, as field_size is
    introduced with this commit. While this patch is strictly speaking not
    in scope of an security update, it is easier to stick with upstream and
    backport this patch in addition.

commit b589a5c6f849cb9892156f53419fbcbebdf9167a
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Oct 30 23:29:58 2009 +0100

    backported libavformat/oggdec.c security fixes
    
    thanks to Marc Deslauriers <marc.deslauriers at canonical.com> for
    identifying the following chrome issues in the ffmpeg svn:
    
    40_ogg_missing_header.patch

commit 0544db98175c7ef53f42ad7a315bdf999a67d80d
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Oct 30 23:29:03 2009 +0100

    backported libavformat/mov.c security fixes
    
    thanks to Marc Deslauriers <marc.deslauriers at canonical.com> for
    identifying the following chrome issues in the ffmpeg svn:
    
    09_mov_stsz_int_oflow.patch:
    32_mov_stream_index.patch:

commit 228ed27163f55681f5dc059c75f6b8a5722b9f27
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Oct 16 10:30:28 2009 +0200

    update debian/changelog

commit e360cf1e68fe051e453124ffa75c3c03914ae09c
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Oct 16 10:36:21 2009 +0200

    remove references to obsolete 'cvs' packages. these have never existed in ubuntu after all

commit b571110576d9e027caa4a4819cd8a2802b19d046
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Oct 16 10:28:43 2009 +0200

    make the conflicts/replaces on the former -unstripped- variants versioned
    
    so the -unstripped- and -extra- variants can actually be coinstalled

commit 3f9d59654c80df066ff724769e2ed5d71e67ca06
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Oct 15 08:57:35 2009 +0200

    h264 security backports

commit 068aa47923722ea6e0560257d51e7b969d65bf40
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Oct 15 00:00:18 2009 +0200

    libavcodec/mpegaudiodec.c backports

commit 15789b14b6111cd763cad2fa6d215484850dd101
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Oct 14 23:40:56 2009 +0200

    backport ffv1 fix

commit 709e4cdfe959b962d2a70104c2f3bd770dabdf33
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Oct 14 23:34:24 2009 +0200

    backport vp3 fixes

commit 406f25d6d0f784ca6bd34dd52eedcd3d0f7c736d
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Oct 14 23:21:50 2009 +0200

    backport oggparsevorbis fix

commit 1ebc392eba00f4ba5a75b236a28893d5b7e2bee4
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Oct 14 23:14:27 2009 +0200

    backport fixes for vorbis_dec

commit a6bc71a320cef32c3082b7d4e30843d095489b20
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Oct 15 09:00:01 2009 +0200

    prepare new upload

commit 04af716999b983b13ce2c1615c15e376ecfd1094
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Oct 14 09:16:12 2009 +0200

    update debian/changelog

commit c92b8ae446bbceb74e2e2530e801d2325797708a
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Oct 14 09:32:49 2009 +0200

    update tag pattern.
    
    this way the ffmpeg-extra package can be uploaded with the same version
    numbers as the regular ffmpeg uploads

commit 789d0795c354697eda00974117adc67d3eb43e70
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Oct 14 07:53:25 2009 +0200

    add extra Conflicts/Replaces, LP: #418785

commit 454d2cb299142d0a02293bdff7e7549ba41cb2d7
Merge: 1261092 484f323
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Oct 14 07:37:21 2009 +0200

    Merge branch 'ubuntu.karmic' into ubuntu.karmic.extra
    
    Conflicts:
    	debian/changelog
    	debian/patches/issue1245.patch
    	debian/patches/series

commit 484f32331a9720ce8a7fd5e6bcc56ed00498bf62
Author: Loïc Minier <lool at dooz.org>
Date:   Tue Oct 13 23:57:30 2009 +0200

    Add changelog entry

commit 19547ea7b43abba55ef61a18c2a05cb36fa66638
Author: Loïc Minier <lool at dooz.org>
Date:   Sun Oct 11 09:36:31 2009 +0200

    Pass -fPIC -DPIC to neon pass

commit b42bddf599fc0b146e57caf1ad8d9ded9203c9c1
Author: Loïc Minier <lool at dooz.org>
Date:   Sat Oct 10 22:52:50 2009 +0200

    Pass proper --cpu and --extra-flags on armel
    
    Instead of passing a long list of --enable/--disable, actually pass
    proper --cpu=armv6 --extra-cflags="-mfpu=vfp -mfloat-abi=softfp" and
    --cpu=armv7-a --extra-cflags="-mfpu=neon -mfloat-abi=softfp" flags to
    configure for nooptflags and neon flags; configure will detect the
    proper features.

commit 974080412977cee359a7c2c200a413c138db2a85
Author: Loïc Minier <lool at dooz.org>
Date:   Sat Oct 10 13:13:33 2009 +0200

    Add backported NEON patches from ffmpeg trunk

commit cac0f52e2dc493d82b25ec2b2fcc2dcd26445271
Author: Loïc Minier <lool at dooz.org>
Date:   Thu Oct 8 16:21:59 2009 +0200

    Update NEON confflags to assume v7 and VFP
    
    NEON implies ARMv7+ and Dave Martin says ffmpeg's NEON implementation
    uses VFP, so update flavs of the neon flavour to use
        --shlibdir=/usr/lib/neon/vfp --enable-armvfp -mcpu=armv7-a \
        --extra-cflags="-mfpu=neon -mfloat-abi=softfp"

commit 580d6d10ef6316b34956a93b66b9e91fb5ea53bf
Author: Loïc Minier <lool at dooz.org>
Date:   Thu Oct 8 16:10:30 2009 +0200

    Enable neon flavour
    
    Enable neon flavour as we can use karmic userspace with boards
    supporting NEON, e.g. BeagleBoard or upcoming Babbage 3.0.

commit 1b21462f47aff06d94ea29120a6e8438b97b3168
Author: Loïc Minier <lool at dooz.org>
Date:   Thu Oct 8 16:09:25 2009 +0200

    Update config for karmic's armel toolchain
    
    karmic's armel toolchain assumes v6 + VFP so drop now useless VFP
    flavour and enable v6 and VFP ffmpeg configure flags.

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

commit f421ba7c78920ba2508cfedf94f46db8cac30889
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Oct 13 23:03:05 2009 +0200

    Support constant-quant encoding for libtheora, LP: #356322

commit f6c42b70fc60e291c92cfe76757d01d66c01baac
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Oct 12 09:34:15 2009 +0200

    use patch for issue1245 from git.ffmpeg.org

commit 55da5e3e470c784489289e499d52e36611aae394
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Oct 13 23:12:44 2009 +0200

    update debian/changelog

commit 3359724e4d04bbe84f8ce023886a2f2f4528ae62
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Oct 12 09:34:15 2009 +0200

    Make arguments of av_set_pts_info() unsigned.
    
    Fixes issue1240/mpeg1/smclockmpeg1.avi.3.1
    
    backport from 'master' branch

commit 12610922d8b4312d418dd5976f67d0c3b0c000e5
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Oct 7 20:07:00 2009 +0200

    Support constant-quant encoding for libtheora (LP: #356322)
    
    patch taken from upstream:
    
    r20109 | conrad | 2009-10-01 00:25:49 +0200 (Do, 01. Okt 2009) | 2 lines
    
    Support constant-quant encoding for libtheora
    Based on a patch by j f (gonzaz-z # operamail (d) com)

commit f002be13b345872692e7136d3e782b90681c1b62
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Oct 7 19:57:15 2009 +0200

    add patch for issue1245

commit c1bc30d1370dab75f103bc6dce0bbe95f482099e
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Oct 1 21:53:45 2009 +0200

    add patch for issue1245

commit d825f43f92866909669da6127c8c8793fe450d22
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Sat Sep 5 11:35:52 2009 -0400

    Bump changelog to prepare new release.

commit 4cd53f65c2d1f81f0f9fed7a9bd8801a4ac5274c
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Fri Sep 4 13:22:56 2009 -0400

    Bump Standards-Version to 3.8.3.

commit 9a62ac164d4bb0552f06007173a64c5308c0bdf0
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Fri Sep 4 13:20:31 2009 -0400

    Update Vcs-* entries to new location.

commit 336b69aa3d98916bb6f34011ca97d0f9758c6de3
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Wed Aug 26 11:23:56 2009 -0400

    Remove unused patches from packaging.

commit e8e8b8b008dd9b1d6a8bc85838f0293e7ade7182
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Aug 26 12:23:21 2009 +0200

    finalize debian/changelog

commit 2689738041177fc4991b1bdcf456e45de1a8b733
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Aug 26 12:22:26 2009 +0200

    no need to build doxygen documentation in ffmpeg-extra

commit 61d1db2d2d60492bcad36c0302b22f991618de88
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Aug 26 11:49:55 2009 +0200

    enable dirac and openjpeg support

commit b5dff3976901e4788a08ed7f53cce5ab0fdcd904
Merge: 17f4d18 b23564b
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Aug 26 11:45:00 2009 +0200

    Merge branch 'ubuntu.karmic' into ubuntu.karmic.extra
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/rules

commit b23564bd0a5fca424ad2927914dd6316aaba98ba
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Aug 26 11:29:31 2009 +0200

    finalize debian/changelog

commit 3ef453db69c7975afbd116898a3c34600b25eb3e
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Aug 26 11:30:39 2009 +0200

    no need to remove the 'forbidden' encoders in the ubuntu package

commit 3f04bffa614e0b512d55ac5e0411a153645ce7c1
Merge: 9843edb f90dd6a
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Aug 26 11:07:22 2009 +0200

    Merge commit 'origin/master'

commit f90dd6a5220627c4956bc44d46981bab7930144a
Author: Fabian Greffrath <fabian at debian-unofficial.org>
Date:   Wed Aug 26 10:51:34 2009 +0200

    Initialize the FLAVORS variable to static instead of appending to it. Also, we do not support the internalencoders variable anymore.

commit 51e27795c824eaab4b31de66f1ed3a9565e4444b
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Aug 26 10:50:52 2009 +0200

    update debian/changelog

commit 98e1b762386dcbec2c12e82f5181091b9a6aa80e
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Aug 26 10:50:25 2009 +0200

    loosen dependencies further, so that the -dev packages remain installable even if ffmpeg-extra is 'out-of-date'

commit bba94d1be0ee7b2556dfd980a41cf40a7450735a
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Aug 26 10:08:09 2009 +0200

    update debian/changelog

commit 90d78a6a9fe708e3306b08a2321e51d0302eff66
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Aug 26 09:53:45 2009 +0200

    update debian/changelog: test upload to ppa

commit a0ffb15354d814ce89179a56fdc40d8d55119e23
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Aug 26 10:06:39 2009 +0200

    really disable dirac

commit 5682dc1f85ebe08efb5fe09f8aff8d29386f9d47
Merge: 48d1a40 9843edb
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Aug 26 09:53:00 2009 +0200

    Merge branch 'master' into ubuntu.karmic
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/rules

commit 9843edbfd055a5ad71bb449d6bd42e6b9ceb5dcd
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Aug 26 09:16:13 2009 +0200

    finalize debian/changelog

commit dbb1ae4162817cc8e81e8bc391ae87213076e5ec
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Aug 26 09:11:20 2009 +0200

    simply debian/confflags by removing the case of renaming the source package (Closes: #543595)
    
    this cases make too much confusion and now that the source package is
    renamed back to 'ffmpeg', all of them need to be reconsidered again
    anyway.

commit 2d6f34831036e43950e6de5f2a030777207fcdbe
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Aug 26 09:12:53 2009 +0200

    prepare new upload

commit 449d1e2e0b8bf55dfa83b232eb11b0d0b27b7d3f
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Tue Aug 25 21:27:37 2009 -0400

    Fix ordering of FLAVORS that are installed. (Closes: #543595)
    'shared' should be after 'static' so that ffmpeg and other binaries in 'ffmpeg'
    binary package do not end up being the binaries linked with static ffmpeg
    libraries.

commit 03bdeab22600d336cf66700eafb2aefcb2ca5a0b
Merge: a005961 2a7cfb4
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Aug 25 16:46:39 2009 +0200

    Merge commit 'origin/master'

commit 48d1a4065be3e3a1e7d689f7461c0073e958f4d5
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Aug 25 16:37:29 2009 +0200

    update debian/changelog

commit 1643c99345b87923e02fb549e0d928812193401a
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Aug 25 16:38:33 2009 +0200

    update the dependencies of the -dev packages for the unstripped -> extra renaming

commit a00596190cb6e140daefc348140cf67db1ea221e
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Aug 25 12:42:32 2009 +0200

    update debian/changelog

commit 0b8ab0ba16f6c152efa8e46becb9a5ffbf4fb40e
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Aug 25 12:40:01 2009 +0200

    change the shlibs file
    
    the shlibs file should now make packages depend on the '-extra-'
    variants instead of the -unstripped- ones. this makes the job of apt's
    dependency solver much easier.

commit c38aa4007970706343a03036a802bc8218408eda
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Aug 25 12:39:06 2009 +0200

    simply rules file by removing the case of renaming the source package
    
    this cases make too much confusion and now that the source package is
    renamed back to 'ffmpeg', all of them need to be reconsidered again
    anyway.

commit 6e787342e5d9307243d656a9379d069f19d43e8b
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Aug 25 08:17:26 2009 +0200

    update debian/changelog

commit 0985e02ff5012100c4351f3a2f46fa7a69889a9c
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Aug 25 08:04:07 2009 +0200

    remove build-dep on libopenjpeg

commit 2a7cfb447f0d03335859204ff246e328b8ed49eb
Author: Fabian Greffrath <fabian at debian-unofficial.org>
Date:   Mon Aug 24 09:07:41 2009 +0200

    Enable support for libdirac, now that it has entered Debian.

commit 775d37c60232cd18e4a8dfdcaca1a0d8c2ed3e55
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Aug 19 21:52:44 2009 +0200

    finalize changelog for real upload

commit e4d9a068106952298565dd36cc23a571bbff37e8
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Aug 19 22:02:49 2009 +0200

    Revert "Enable yasm for i386 and amd64."
    
    yasm is only in universe, remove it for upload to main.
    
    This reverts commit 0e9c5d2eeb6639e913ef65439d4fe23171713811.

commit dcc70793e85552124d562948dd0c3988431f26dc
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Aug 19 19:14:54 2009 +0200

    update debian/changelog

commit 5d3dba83be4b12e5db71e772e51d97c6c51aec7d
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Aug 19 19:14:47 2009 +0200

    change shlibs file to make applications depend on the -extra- packages

commit 17f4d188123b78e96f5ce314a24f5e9376ef4830
Merge: 7c4e8af bc96ef2
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Aug 16 10:43:17 2009 +0200

    Merge branch 'master.extra' into ubuntu.karmic.extra

commit 7c4e8af0dd9aa29e76409f258f3092cd6d6e98d0
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Aug 15 18:36:33 2009 +0200

    branch was renamed

commit 8dca0e7357996f59cd85c368849b3f1ef53085ee
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Aug 15 18:36:09 2009 +0200

    fix source package name in debian/control

commit 8535a9265905937fb543af06a99fa94a06746d8b
Merge: 212579c dd19e9c
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Aug 15 18:35:22 2009 +0200

    Merge branch 'ubuntu.karmic' into ubuntu.karmic.extra

commit dd19e9c681e153ce4dbcb119e0763b431b215582
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Aug 15 18:32:55 2009 +0200

    ppa upload

commit 6f8a2014e8aafdbefaa1a5ddec1640592f57abc3
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Aug 15 18:18:28 2009 +0200

    update debian/changelog

commit ada0e33246f98adcc03f68da2747ee0645cff17f
Merge: 31fac7e cd842cb
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Aug 15 18:17:29 2009 +0200

    Merge branch 'master' into ubuntu.karmic
    
    note: this merge renames the source package back to 'ffmpeg'

commit bc96ef2a853d4241eaa0663804cdfc397e7ed09d
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Aug 15 11:32:00 2009 +0200

    update debian/changelog

commit bb15513303b1211e6b8367e40f8931a843648e56
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Aug 14 19:24:42 2009 +0200

    fix name of package libpostproc-unstripped-51

commit 4f073d5901e4f3e78d3d4a5f2e896b116f2c476c
Merge: cf4cebb cd842cb
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Aug 14 19:20:14 2009 +0200

    Merge branch 'master' into master.extra

commit cd842cb7cb542c03a071fbd69b4d7cc190a387b2
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Aug 14 18:50:32 2009 +0200

    update debian/changelog

commit 7ab681e16ab220709b4ae6e1162d140d32b5b6ae
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Aug 13 13:36:56 2009 +0200

    don't disable ffserver in various optimized variants
    
    patch cherrypicked from ubuntu branch

commit 180e98438de9851d3f390a12701a7b9a98e496d9
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Aug 13 13:34:09 2009 +0200

    merge cond_enable_nf flag from master.extra branch
    
    port "support" for the faac to that macro

commit 94e3ace638097b40b2ea0c5977eb7e3bec833961
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Aug 13 12:48:52 2009 +0200

    prepare new upload
    
    (and restore old, published changelog entry)

commit e934201d7065cbcb2303ea87e5d468af59e6c983
Merge: 3769afb 6f5b79a
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Aug 13 12:45:21 2009 +0200

    Merge commit 'upstream/0.5+svn20090706'

commit 6f5b79a2e80838f40f06a92a850255e141281982
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Aug 13 12:44:59 2009 +0200

    Imported Upstream version 0.5+svn20090706

commit 3769afb6854e32af5bb8d6c7da74d6b567b37e2b
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Aug 13 12:38:54 2009 +0200

    rename the source package from 'ffmpeg-debian' -> 'ffmpeg'

commit 02ed2b15d992a28b927f6dfa3c4d164c75ac45b4
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Aug 13 12:30:37 2009 +0200

    simplify README.upstream-upgrade
    
    we no longer maintain an seperate upstream.unstripped branch. All
    unstripped sources can now be found in the 'main' upstream branch.

commit 633ba29a7b2e3318fb68bb7cb41ae2f6aec5856e
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Aug 13 09:56:00 2009 +0200

    don't disable building of statically linked helper binaries
    
    although they are not being installed in the 'ffmpeg' package, they are
    still very useful to check during testing a patch.

commit 6306e50463062ef8833c129626bb4bcf7a3e40ac
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Aug 13 10:02:02 2009 +0200

    fix seeking in DIF (DV) movies, closes Bug: #540424
    
    Thanks to Dan Dennedy <dan at dennedy.org> for identifying the patch!

commit a0416655bb12cbf283d8cf44d4c1d0ff6a6e95d1
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Aug 10 10:37:06 2009 +0200

    fix aac playback regression (Closes: #540729)
    
    patch taken from upstream. Thanks to Matthew Wakeling for reporting!

commit b25e5c73bfd082cf4b8d9e5fb95bcce6b68bef54
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Aug 10 09:05:54 2009 +0200

    AAC is considered non-free upstream, disable it for now

commit 212579cb9a2ea96e6e7f64f1d7f9df553fe96505
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Aug 1 23:38:03 2009 +0200

    remove nvidia headers

commit d7eefb2ab647f86a0f535140b0b445faf616441a
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Aug 1 23:37:36 2009 +0200

    prepare new upload

commit ec7170941b303ecfdc3762a66b4e604034b4c0bd
Merge: b63299b f86c002
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Aug 1 23:36:02 2009 +0200

    Merge branch 'ubuntu.karmic' (early part) into ubuntu.karmic.unstripped

commit f86c002b291b4234fac4e05184f2cdb4217947c4
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Aug 1 23:30:14 2009 +0200

    prepare new upload

commit 31fac7e231646de1e79537fdcec278800ccef419
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Aug 1 23:29:48 2009 +0200

    readd libxvmc-dev build dependency

commit a86f6fad495e6de3b69f4b1ccde52cfe97407ac6
Merge: 6c89ae4 0281d77
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Aug 1 23:27:33 2009 +0200

    Merge branch 'master' into ubuntu.karmic

commit cf4cebbb985a979866469b174987d4745b36ea9f
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Aug 1 22:37:38 2009 +0200

    add conflicts/replaces fields on libavfilter-extra-0 package

commit fa114b707a11090595ac6d365412095cbf5af4f1
Merge: 41a6f60 0281d77
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Aug 1 21:46:20 2009 +0200

    Merge branch 'master' into master.extra

commit 0281d775ac9eb6c2b025e8759b9deb5ba11ee88d
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Aug 1 13:18:26 2009 +0200

    update debian/changelog

commit 7a6b5c8e5384a754409296839619fd68bbc3a1a9
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jul 26 10:39:33 2009 +0200

    add note about the lintian override

commit 9c7ea853f7967752a500b4a31e97be204d7ae211
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jul 26 10:39:06 2009 +0200

    remove section numbering from README.Debian
    
    newer entries are supposed to be added at the beginning of the
    file. Remove the numbering as they will break each time a new addition
    is made.

commit 66132365f0282787d73d4083ed57d4a498536ed6
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Jul 24 20:00:07 2009 +0200

    sort build dependencies alphabetically
    
    this way duplicate entries occur earlier

commit ab7439b80a31f6fbe4391c6f14cb43b33a15a74a
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Jul 24 19:59:06 2009 +0200

    remove duplicated libxvmc-dev build dependency
    
    one time is enough

commit b63299b3615a8b54e7e6d4083119d412ce5c0204
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jul 25 11:30:16 2009 +0200

    fix version number

commit 3b9e28208c065484196946922a2580fee22ba4f3
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jul 25 10:44:24 2009 +0200

    update debian/changelog

commit 1fe62bdb2988836648d53cb48e4c7acf7e723129
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jul 25 09:28:15 2009 +0200

    update debian/changelog

commit 19f56203cecbacdd61e9640e1f312cb08bcdf6ed
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jul 25 09:24:35 2009 +0200

    enable libopenjpeg support for the multiverse package

commit b377b952b3a9f9749e7932fb2f06599bdc6b4518
Merge: 92228d7 6c89ae4
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jul 25 09:23:28 2009 +0200

    Merge branch 'ubuntu.karmic' into ubuntu.karmic.unstripped

commit 6c89ae405f18b7d775fe2367f41f17516fe74736
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jul 25 09:18:21 2009 +0200

    update debian/changelog

commit be573f980e1857988db506f1b850056de24bc763
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jul 25 09:13:02 2009 +0200

    don't build against faac in any case, it is deemed non-free

commit 580015f6834b477ef9f9d321535c3af9f6a7c6a8
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jul 25 09:12:39 2009 +0200

    do not forcefully enable objenjpeg, it is not avaiable in this build anyway

commit 92228d7f163af23fbc9537e91d14c6adb968ff2c
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Jul 24 22:01:35 2009 +0200

    update debian/changelog

commit 9d3b285814bc7b05293222facdd854975832ad54
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Jul 24 22:00:12 2009 +0200

    add missing comma in build depends

commit 2d6c1057a1c43af3169d3aed99ee175cf157ffeb
Merge: 5933d24 a29c267
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Jul 24 21:56:05 2009 +0200

    Merge branch 'ubuntu.karmic' into ubuntu.karmic.unstripped

commit a29c267e31d4c65547aa3d577383d5288d5be455
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Jul 24 21:54:25 2009 +0200

    update debian/changelog

commit 955b451990a8ec4308f97fde6045e47216cc09e5
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Jul 24 21:48:24 2009 +0200

    remove duplicate libxvmc-dev build-dependency

commit 84cda2c3494b37988fb72ec01c4a82ed73c01b16
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Jul 24 21:47:21 2009 +0200

    remove libopenjpeg-dev from build depends (fixes FTBFS)

commit 84ffe11353a616ba3ddd622b98a405540453d541
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Jul 24 19:52:59 2009 +0200

    update debian/changelog

commit 5933d24f8c6b02dc0d425e5ce2e04280f1bfb3e2
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Jul 24 19:48:12 2009 +0200

    update debian/changelog

commit e8fa838d8453501767acc350d026bf6f92002a11
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Jul 24 19:43:28 2009 +0200

    regroup build dependencies to minimize the diff

commit 912dda74b0743349936bad435e69137b56447d84
Merge: cbdb396 9064f84
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Jul 24 19:38:47 2009 +0200

    merge from ubuntu.karmic

commit 9064f84ca6252ac37dc9869008d52a59732111c1
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jul 18 10:57:02 2009 +0200

    move gbp.conf to debian/

commit 7b761840c69eda7fec5f0e977465a802ac15d49b
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jul 18 10:56:18 2009 +0200

    update gbp.conf

commit 97012a0539020b6c51a27f2033aefce301987d59
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jul 18 10:55:30 2009 +0200

    prepare new upload

commit 4f417111d13440df10b5b8f6df2cf1c5e5cc6951
Merge: 4d871fa 2dbc0de
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jul 18 10:55:04 2009 +0200

    Merge commit 'debian/0.5+svn20090609-1' into ubuntu.karmic

commit 6b646aad457d4ea057b4d8c56a1c01a029e0320f
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Mon Jul 13 10:51:46 2009 -0400

    Revert "Remove debian/lib*.lintian-overrides: The fact theat we already know about the PIC issues and do not fix them ourselves does not mean that we keep them on purpose, so the lintian warning is well justified and *not* a false positive."
    
    This reverts commit d6a9853a846706d494af1b1c3b2aa9bbf265cb4d.
    
    lintian finding relocatable text in shared libraries is not a false positive.
    Also, these are lintian errors, not warnings. At best, we are adding the
    overrides because we are making an exception to policy.

commit d6a9853a846706d494af1b1c3b2aa9bbf265cb4d
Author: Fabian Greffrath <fabian at debian-unofficial.org>
Date:   Mon Jul 13 14:07:51 2009 +0200

    Remove debian/lib*.lintian-overrides: The fact theat we already know about the PIC issues and do not fix them ourselves does not mean that we keep them on purpose, so the lintian warning is well justified and *not* a false positive.

commit 41a6f60f8a6dedd574ba947d62864ac0b8d92076
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jul 12 18:45:36 2009 +0200

    update debian/changelog

commit 9496ec1cea4506e4c885f08a411da8324f777b97
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jul 12 19:27:50 2009 +0200

    build depend on extra libraries
    
    In detail:
     - libx264-dev
     - libmp3lame-dev
     - libxvidcore-dev
    
    these package can be found in the debimedia archive

commit a68dc78498a46402d2ab681b611650d533d496c4
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jul 12 18:26:23 2009 +0200

    build depend on the regular ffmpeg libraries
    
    this is to ensure the relevant .shlibs file are available

commit 10c800eb5c28788b618cd26fb69b6970d4f4c4be
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jul 12 18:49:16 2009 +0200

    rename source package to ffmpeg-extra
    
    rename -unstripped- package to -extra- in debian/control, introduce
    transitional packages that depend on the newer ones and rename
    debian/*-unstripped-*.install files to *-extra-*

commit e5726d4e7e88f94af82f3960a40c692b82248a91
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jul 12 11:35:13 2009 +0200

    update gbp.conf

commit a5940ccec8b383ec81570c49c960c3dc7b8cdabd
Merge: e58e981 94629f3
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Jul 10 22:44:04 2009 +0200

    Merge branch 'master' into master.extra

commit 980104cf8984a15ee6b5cc39944b22fc9ad1d140
Author: Fabian Greffrath <fabian at debian-unofficial.org>
Date:   Thu Jul 9 10:26:54 2009 +0200

    Replace "dh_clean -k" by dh_prep.

commit 8d279fb4af5b82052fc4b99ec1814584b19ee11e
Author: Fabian Greffrath <fabian at debian-unofficial.org>
Date:   Thu Jul 9 10:25:51 2009 +0200

    Clean up clean target in debian/rules in favour of debian/clean.

commit 7011733f27e79502bac175bf816256cf84771978
Author: Fabian Greffrath <fabian at debian-unofficial.org>
Date:   Thu Jul 9 10:19:01 2009 +0200

    Bump debhelper compat to 7.

commit 5e472de3b0fbc5c2911173731d18bdacc9074918
Author: Fabian Greffrath <fabian at debian-unofficial.org>
Date:   Thu Jul 9 10:13:24 2009 +0200

    Quote opts in debian/watch.

commit de308c207658124af22bc25fff7ff2b312592ff9
Author: Fabian Greffrath <fabian at debian-unofficial.org>
Date:   Thu Jul 9 10:04:59 2009 +0200

    Remove parallel make support from debian/confflags, it's overridden in debian/rules anyway.

commit 561ce0bdeafb222625889ea1bd3cb8905f29d006
Author: Fabian Greffrath <fabian at debian-unofficial.org>
Date:   Thu Jul 9 09:57:58 2009 +0200

    Document the copyright notice and license for the VDPAU headers in debian/copyright.

commit c39769364b1f02b334cb78b5d44c6f27b84e7c01
Merge: 86fa29a 94629f3
Author: Fabian Greffrath <fabian at debian-unofficial.org>
Date:   Thu Jul 9 09:49:02 2009 +0200

    Merge branch 'master' of ssh://git.debian.org/git/pkg-multimedia/ffmpeg-debian

commit 94629f3f66fdc26cbfe0d2d4669bac101835a53d
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jul 7 09:52:53 2009 +0200

    refresh patches

commit 3daf9d8302baba7dd6f2f4da6179180510a5d318
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jul 7 09:49:57 2009 +0200

    Revert "Refreshed patches."
    
    Patch does not match the patch discription. It introduces uncommented
    changes to d/p/fix-qtrle-encoding-when-previous-frame-linesize.patch.
    
    This reverts commit b590a48eae654ba699a592ee3c9ee1ba1d9b2706.

commit 1606c480eb2d76f673001cba1868a9c01eed214b
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jul 7 07:18:52 2009 +0200

    clarifications suggested by upstream in README.Source
    
    clarify that ffmpeg in main was never patent free and the change here
    doesn't change anything about that here.

commit 45d2e4d2cf6cf98b38ef2a806eba95f91fbe7228
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Tue Jul 7 01:33:04 2009 -0400

    Revert "Fix Suggests field for libavcodec-dev."
    
    This reverts commit 51e2ff941c48532cf61ab2897db8b7e720996896.

commit 51e2ff941c48532cf61ab2897db8b7e720996896
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Mon Jul 6 16:00:37 2009 -0400

    Fix Suggests field for libavcodec-dev.
    
    lib1394-dev was set as ${lib1394-dev}.

commit 0e9c5d2eeb6639e913ef65439d4fe23171713811
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Mon Jul 6 15:59:50 2009 -0400

    Enable yasm for i386 and amd64.

commit 27cfe82ab6f6597a266b2d456cfd894e63281070
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Mon Jul 6 15:56:37 2009 -0400

    Don't disable encoders if internalencoders is set in DEB_BUILD_OPTIONS.

commit 1b76f2aa6af35b63938c30492a0e5aaa17d83a7b
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Mon Jul 6 14:57:10 2009 -0400

    Add vdpau support by including vdpau headers in deb packaging. (Closes: #511544)
    
    The vdpau headers were taken straight from
    ftp://download.nvidia.com/XFree86/vdpau/include/vdpau/.

commit b590a48eae654ba699a592ee3c9ee1ba1d9b2706
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Mon Jul 6 13:16:24 2009 -0400

    Refreshed patches.

commit 6bc4519ec1f55841dfe6ca5d5abc238eeffdf895
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Mon Jul 6 13:04:50 2009 -0400

    Prepare new release.

commit 86fa29a102fe4a37524cc2b1170c13984a948361
Author: Fabian Greffrath <fabian at debian-unofficial.org>
Date:   Mon Jul 6 14:18:58 2009 +0200

    Finally remove strip.sh.

commit 0d46b42886f5de16868491bae6c8f2bd2a714528
Author: Fabian Greffrath <fabian at debian-unofficial.org>
Date:   Mon Jul 6 14:17:56 2009 +0200

    Remove debian/fixup-config.sh which was only a hack needed to repair the crippled config.h

commit 27fcbf2e5a48803ce689d87b6fa9122d8e4d8a7f
Author: Fabian Greffrath <fabian at debian-unofficial.org>
Date:   Mon Jul 6 14:14:54 2009 +0200

    Remove .install files for unstripped packages that we do not build from this branch anyway.

commit 2dbc0de8b327aee8ac21b6ac6172f222231130d2
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Jul 6 07:58:52 2009 +0200

    just copy .svnrevision, don't mangle it with 'echo' and 'cat'
    
    without this patch, the ffmpeg binary produces this:
    
    FFmpeg version SVN-rSVN-r19134-4:0.5+svn20090609-1, Copyright (c) 2000-2009 Fabrice Bellard, et al.
    
    one "SVN-r" too much.

commit caae445b2bb6e79e2b15117cab40b2f572cec219
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jul 5 22:52:59 2009 +0200

    update debian/changelog

commit f9e25b9759cca5e7cb8314f24f37c7f75c886919
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jul 5 22:52:36 2009 +0200

    bump standards version, no changes needed

commit 0a8520187c3845e007c782ecb74912ede8ba3635
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jul 5 22:43:50 2009 +0200

    fixup version number in debian/changelog

commit e079ef8e56c9915c82e3175bb7973d20573d3fb1
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jul 5 19:46:24 2009 +0200

    update debian/changelog

commit 1ff3ca5c1f140e1848331e33bfd02004a591d7ec
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jul 5 19:51:07 2009 +0200

    remove hack to build with stripped sources
    
    since we no longer strip the sources, we no longer need to fake the
    included config files to ensure the build succeeds.

commit 82a0838de50067b828bc9e4d5830aba56c523edb
Author: Fabian Greffrath <fabian at debian-unofficial.org>
Date:   Sun Jul 5 19:47:09 2009 +0200

    Add notes on why the orig.tar.gz is no longer "stripped"

commit 256a27a4432daa4fd4c048b4974b477c69d451c5
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jul 5 10:21:14 2009 +0200

    fix quilt series file: add missing suffix to qtrle patch

commit cec9935e9d73a9f8d2fe4aa5ddb86708068c9e1c
Merge: 23d0060 29e39ed
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jul 5 10:15:44 2009 +0200

    Merge branch 'upstream'

commit 23d0060abe10c7ac094f775f5d4e28e7dd6815f3
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Jul 3 23:40:58 2009 +0200

    adjust notes in README.upstream-upgrade for the now unstripped debian source package

commit 29e39edb6374c64528a61304aa0965e1cfca363c
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Jul 3 23:47:09 2009 +0200

    Imported Upstream version 0.5+svn20090609

commit a879aae382fb3171bb5744c738fd17ffa1cce797
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Jul 3 22:57:42 2009 +0200

    no longer strip the source on upstream upgrades
    
    however leave in debian/strip.sh for now. We should remove it if this
    version of the package gets ACCEPTed in debian.

commit 38e8a83455994c160dc00347436f3c39e5d838a2
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Jul 3 22:49:13 2009 +0200

    reorganise README.Debian for the new plan [tm]
    
    In preparation of having an unstripped source package in debian/main,
    make the README.Debian file a bit less confusing. As discussed on the
    mailing list, we will upload an unstripped source for debian main, but
    disabled the encoders during build time.

commit 0ea2a249f54f0231235dd8045f9edaa980b0575a
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Jul 3 21:42:18 2009 +0200

    Enable xvmc support by adding libxvmc-dev to build dependencies

commit dbca945f4fed14a3b38cfdeccd64ce7700d11db4
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jun 20 20:05:22 2009 +0200

    add patch for qtrle encoding (Closes: #530016)
    
    Patch contributed by Peter Fritzsche <peter.fritzsche at gmx.de> and
    already applied upstream:
    
    ------------------------------------------------------------------------
    r18908 | bcoudurier | 2009-05-23 07:55:29 +0200 (Sa, 23. Mai 2009) | 1 line
    fix qtrle encoding when previous frame linesize differs, fix #998

commit bd77e129ab4517b728a01d15934e44d134a99715
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Wed Jun 17 12:56:30 2009 -0400

    Make get-orig-source.sh executable.

commit 2e585c669202abad49804db35fd086dc812bb1f4
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Wed Jun 17 12:55:04 2009 -0400

    Fix watch file to ignore daily snapshots.

commit 820357139e693d2fe10c653a4ccaf10bd6b130b3
Author: Fabian Greffrath <fabian at debian-unofficial.org>
Date:   Wed Jun 17 16:30:45 2009 +0200

    Cleaned up debian/watch file.

commit 0ed4d6469fe04887a5aa3561e99cc02b91c22267
Author: Felipe Sateler <fsateler at gmail.com>
Date:   Thu Jun 4 21:01:37 2009 +1000

    Pass explicit version to git-import-orig
    
    git-import-orig currently can't automatically parse version numbers
    with + signs, which is our case.

commit b30a3a47defa25e0b40993076f05c2178699d326
Author: Felipe Sateler <fsateler at gmail.com>
Date:   Thu Jun 4 20:14:42 2009 +1000

    Don't add -unstripped to the unstripped variant version number
    
    The source package for the stripped and unstripped versions differ,
    so there is no need to change the upstream version. It also confused
    git-buildpackage + pristine-tar

commit d8a63c3be9bdf300f44d658c16d272f9a29558c2
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Mon May 25 03:32:06 2009 -0400

    Fix patch to what's really been applied upstream.

commit d12d7274a3ae498ae1fbe3a6051eb99cdd47c883
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Sun May 24 20:14:29 2009 -0400

    Remove patches for new libamr* libraries as these are not proper solutions.

commit 40c201a6aae7b4bfcdfa05f870bcf9fa92cc6786
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Sun May 24 20:10:26 2009 -0400

    Add fix for FTBFS for GNU Hurd OS. Thanks Marc Dequènes.

commit fb2f827eb4fce37267ebf9bc339ee3978b724a42
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Sat May 16 01:10:08 2009 -0400

    Use backqouted command substitution instead.

commit 465adb7f6b529029c2e6b83ea4262fedb6b8d8bb
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Fri May 15 03:06:09 2009 -0400

    Fix check for .svnrevision, would fail if it was unreadable.

commit bfadf4fccc2e1db67620eb444471f1254f9e4e50
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Thu May 14 18:57:08 2009 -0400

    Update source lintian-overrides for modifications to debian/rules.

commit d9d3c6855e891857d4033d6365481917fba32d4d
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Thu May 14 18:55:20 2009 -0400

    Only use .svnrevision if it's readable.
    
    This helps in cases where we want to track and build packages for upstream
    svn/git.

commit 836cd0ef77820c887a8fd6ba4b157db031ab4160
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Thu May 14 14:40:35 2009 -0400

    Add lintian overrides for ffmpeg-debian source warnings.
    
    This is for the debian-rules-calls-debhelper-in-odd-order dh_makeshlibs lintian
    warnings.

commit e5ba8104bd5792a78327f2a7700006d517b04438
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu May 14 09:01:36 2009 +0200

    revert to strict internal libavcodec dependencies
    
    In the following commit, we implemented different internal dependencies
    to what is specified in the (also generated) shlibs file without using
    an shlibs.local file.
    
    commit a1229f8ace3f5cf129685b26d9ef212637caa3b9
    Author: Fabian Greffrath <fabian at debian-unofficial.org>
    Date:   Wed Jan 28 15:10:58 2009 +0100
    
        Use an alternative approach to achieve strict internal dependencies
        by calling dh_makeshlibs twice in debian/rules instead of a
        debian/shlibs.local file.
    
    This patch reinstantiates this behavior. The previous commit did not
    clearly indicate that it was the intention to change this behavior.
    
    This reverts parts of commit 3ed1b06fc000290545cdb5f92f0cf39f32e60ce7

commit faea1156dba628970938e63549680f18d4ff9e75
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu May 14 07:44:07 2009 +0200

    improve patch description for debian/patches/100_kfreebsd

commit 7919bb1d575f70d25422aeb7784366824a442328
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu May 14 07:43:27 2009 +0200

    remove debian/control.* mechanism
    
    as discussed on pkg-multimedia, maintaining the flavors in control.*
    does cause more maintenance overhead than its worth. They have already
    been removed in the mplayer package, and are now being removed in the
    ffmpeg package. The unstripped variants should be built from the
    master.unstripped branch instead.

commit 82956422661b055cfc5fecb183d61857c9b26b00
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu May 14 07:40:22 2009 +0200

    revert spurious, undocumented hunks in debian/control

commit 3b539bf76e12d93b0281a676fa6009e609054699
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Wed May 13 23:23:08 2009 -0400

    Include patches to allow us to use opencore-amr libraries.
    
      These patches have been applied upstream. Including these now so we may work
      with opencore-amr libraries.

commit 015003a2637c764e9e8925d923b2d66fb747d7a9
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Wed May 13 22:04:44 2009 -0400

    Fix FTBFS on kfreebsd. (Closes: #528591)

commit 93cf63c6c6c5286f645ea033f3230fb3bf96087d
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Wed May 13 21:25:00 2009 -0400

    Adding back .svnrevision file.
    
      Thought this file was not important, sorry.

commit 1973752f66bc89f13b9d001da387ba43bf3ea6cd
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Wed May 13 21:12:01 2009 -0400

    Allow passing in extra confflags, removes the need for fix-fpic DEB_BUILD_OPTIONS.
    
      This is a matter of convenience so we can test builds of ffmpeg with other
      configure options, such as enabling libdirac and libamr among other things.

commit ee21dae1144d9f0715279ad2ed9c6125a401702e
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Wed May 13 04:28:58 2009 -0400

    Shorten comment on lintian-overrides.

commit d843d9b228686ce84b2bf45d448c24e2f8436bae
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Wed May 13 04:26:11 2009 -0400

    Add lintian overrides for remaining fpic lintian errors.

commit 11097f515a5f4f2e481167ebe75c68093f06e201
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Wed May 13 04:11:56 2009 -0400

    Build-Depend on debhelper (>= 6.0.7~) for dh_lintian.

commit 87f546dc19e9c1b69be23791aee4a0757915dd95
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Wed May 13 03:48:20 2009 -0400

    Update comment on fpic-* patches
    
      Update the comments to direct users to bug #528080 for inquiries on these
      patches.

commit 2085ba45ca3756014ec26516cd53307fb1a86829
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Wed May 13 03:41:57 2009 -0400

    Use dh_lintian to install lintian overrides

commit 5bec5ad540f0e69415008d35a5a0464fa798cb11
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Wed May 13 03:33:30 2009 -0400

    Fix FTBFS for ffmpeg source package with -dev packages (Closes: #527761)
    
      This would fix builds of the ffmpeg source package that are built with -dev
      packages.

commit c8d8dada2e82b153e2a054b3f8f070d916b15d57
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Tue May 12 23:42:33 2009 -0400

    Bump version in changelog to prepare new release

commit e09fa9ad6c4eb1a414555acd07d9d633c593761a
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Tue May 12 23:37:06 2009 -0400

    Add man page for qt-faststart.
    Add watch file.
    Add lintian override files.

commit 1768760e24c881dcf232cf9c45488fcf913c4806
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Tue May 12 23:35:16 2009 -0400

    Add comment to 900_doxyfile patch.
    Add fpic patches but don't enable them for quilt.

commit 4bf3d79d802bddb86ef52f1759a849f8e6bf0743
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Tue May 12 23:33:06 2009 -0400

    Use <package>.docs files for installing documentation.
    Fix corresponding <package>.install files.
    Add ffmpeg-doc.doc-base file to register ffmpeg documentation with doc-base.

commit 3ed1b06fc000290545cdb5f92f0cf39f32e60ce7
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Tue May 12 23:27:06 2009 -0400

    Use <package>.docs files to add ffmpeg and ffmpeg-doc documentation.
    Add lines to install lintian overrides but don't enable them yet.
    Fix ordering of dh_* calls in binary-arch target.

commit 4b453cb6e97f4c960433e2134228b266458ed2bd
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Tue May 12 23:18:59 2009 -0400

    Add new confflags for new build dependencies.
    Also add confflag for zlib.
    Add 'fix-fpic' DEB_BUILD_OPTIONS for resolving fpic issues.

commit 108ff6368a7e127c11c40cebdac6ba0f6e5102b9
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Tue May 12 23:07:36 2009 -0400

    Update to control files.
      Add myself to Uploaders field.
      Add DM-Upload-Allowed: yes field.
      Bumped Standards-Version to 3.8.1.
      Add Build-Depends of libopenjpeg-dev and libbz2-dev.
      Drop redundant use of Section: libs from binary packages.
      Specify a version for Breaks field in libavformat52 package.
      Add Depends entries found in debian/control to debian/control.ffmpeg-debian.
      Regenerate debian/control.

commit 68ae328ed268e0af29f8d01078fa4ffd0957f504
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Mon May 11 13:56:17 2009 -0400

    Revert huge commit.
    
    This reverts commit 5e546ce45f22e206c2dce0cb8bf27fe6cd31a376.

commit f46caf5aac92bdc598c09d579b7c1f274dbee70e
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Mon May 11 13:55:52 2009 -0400

    Revert "Add lintian overrides for remaining issue with -fPIC"
    
    This reverts commit 9ce9aac1deb2e29d0a6e35d14638953375b037c2.

commit 9de31733d0b33167ac1258310d76bfa3e3360273
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Mon May 11 13:55:37 2009 -0400

    Revert "    + Reorder when dh_strip is done so qt-faststart is also stripped."
    
    This reverts commit 9d2c3f7feb41b4f361ee514d7e367b6444cbb439.

commit b41b1841900ae2c4e0350b2cc383deed42f1965f
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Mon May 11 13:55:18 2009 -0400

    Revert "Fixed non-PIC code from showing up in libpostproc shared library with -fPIC enabled"
    
    This reverts commit c8f1b153b6d941955cbc15becf2766af53d47c0f.

commit ecb427f76e0677228f4e0785441a2057ae6844d2
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Mon May 11 13:54:50 2009 -0400

    Revert "Add more fixes for non-PIC lintian error"
    
    This reverts commit 2cfd35526d280ec3130ed86971be97e11d52970b.

commit 2cfd35526d280ec3130ed86971be97e11d52970b
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Mon May 11 01:52:19 2009 -0400

    Add more fixes for non-PIC lintian error
    Disable all fPIC fixes for now

commit c8f1b153b6d941955cbc15becf2766af53d47c0f
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Sun May 10 20:19:22 2009 -0400

    Fixed non-PIC code from showing up in libpostproc shared library with -fPIC enabled

commit 9d2c3f7feb41b4f361ee514d7e367b6444cbb439
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Sun May 10 14:19:17 2009 -0400

        + Reorder when dh_strip is done so qt-faststart is also stripped.
        + Write man page for qt-faststart.

commit 9ce9aac1deb2e29d0a6e35d14638953375b037c2
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Sun May 10 05:03:00 2009 -0400

    Add lintian overrides for remaining issue with -fPIC

commit 5e546ce45f22e206c2dce0cb8bf27fe6cd31a376
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Sun May 10 03:49:30 2009 -0400

      * Add myself to Uploaders list.
      * Add DM-Upload-Allowed: yes field.
      * Bump Standards-Version to 3.8.1.
      * Add libopenjpeg support. (Closes: #527811)
      * Add bzlib support. (Closes: #527844)
      * Explicitely enable zlib and bzlib support in configure script.
      * Build static libraries for ffmpeg-debian and ffmpeg packages.
        (Closes: #527761)
      * Modify control.ffmpeg-debian to match Depends of *-dev packages in control
        file introduced in previous pacakage version.
      * Some changes recommended by lintian.
        + Add watch file.
        + Fix ordering of debhelper calls.
        + Remove redundant Section fields in control file for binary packages.
        + Add comment in patch, also refreshed it.
        + Fix lintian error shlib-with-non-pic-code.
        + Don't install LICENSE. The licensing information should be, and is,
          covered in debian/copyright.
        + Fix 'breaks-without-version libavcodec51' warning.
      * Register ffmpeg documentation with doc-base.
      * Install documentation with dh_installdocs.

commit e58e981e28a56576a782b9178423ff6c74d19b8d
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat May 9 09:45:58 2009 +0200

    remove build dependencies only found on debian-multimedia
    
    As it seems that marillat has decided to continue tracking svn trunk, we
    have no longer interest in trying collaboration with him. Therefore
    these additional build dependencies should go. This means that the
    master.unstripped package should only reference packages that can be
    either found in debian proper or are at least maintained by
    pkg-multimedia.
    
    this is not a new policy decision but rather a revert to the previous
    state of affairs.

commit d39507a6479cf318aa662b86a56e698985e6fc1f
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri May 8 07:55:28 2009 +0200

    fix sill typo
    
    should have been merged with previous commit, but it has already been
    pushed.

commit bc08e4a5bc8fa94eaa8dcb27a25894af72dd635a
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri May 8 06:45:31 2009 +0200

    use $(disable_encoders) only in the ffmpeg-debian package
    
    ,----
    | From: Felipe Sateler <fsateler at gmail.com>
    | Subject: Re: [SCM] FFmpeg packaging branch, master, updated. debian/0.5+svn20090420-1-6-g26f492d
    | To: pkg-multimedia-maintainers at lists.alioth.debian.org
    | Date: Fri, 8 May 2009 08:55:41 +1000
    |
    | [...]
    | Shouldn't this line be protected by some conditional to be able to build the
    | unstripped packages?
    `----
    
    Felipe is totally right.

commit 26f492d6d2d5a853f0663e7d10264ed2e5979e49
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu May 7 20:42:53 2009 +0200

    update debian/changelog

commit 9b41ad6cfdeebb59bd689b82b914446ba1020249
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu May 7 20:37:47 2009 +0200

    fix SHLIBS_VERSION in debian/rules (Closes: #527350)
    
    We must not use the current epoch, as this leads to the situation that
    any packages built against ffmpeg will not be installable.

commit 0725c02214926cff6e0b08fe2722ec07751739bf
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue May 5 22:36:00 2009 +0200

    explicitly disable 'dangerous' encoders on the command line
    
    This commit should be more or less a noop in Debian. A visible change is
    that the list of disabled encoders is printed by the 'ffmpeg' binary.
    
    In future, I expect that we don't need to strip the source anymore. In
    order to keep the encoders out of the binary package, we need to
    explicitly disable them on the configure line. This is done with this
    commit.

commit f2c43661a3628029bcc3c98a03af1c9970ddab0b
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue May 5 22:24:53 2009 +0200

    set nooptflags only for relevant architectures
    
    This makes the --configure line a bit shorter. This has a visible effect
    on the 'ffmpeg' binary. It encodes the complete configure line in the
    binary.

commit de2dd704bcca1dc67c6df6b9032693734a37847b
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon May 4 07:43:13 2009 +0200

    fix dependencies for libavutil-dev and libavfilter-dev
    
    2 typos slipped into the previous upload. Nothing grave, but without
    fixing them, libavutil-dev and libavfilter-dev are not installable with
    the unstripped variants.

commit e5c2a36003f9bd6ced5a5a0875eab3ae92c4f8d3
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon May 4 07:41:30 2009 +0200

    prepare new upload

commit 304f73bf06b603a19175dc32b95f73db268ab171
Merge: bc41f08 19a82c9
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun May 3 22:23:14 2009 +0200

    merge from the 'master' branch

commit bc41f08d7a508295ac97bc9ef1bc70cc5be7e90a
Merge: 6de2c65 103afd5
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun May 3 21:57:17 2009 +0200

    Merge commit 'upstream.unstripped/0.5+svn20090420-unstripped' into master.unstripped

commit 103afd5eef0d368f62a2f9410ca12ba17e44f1e9
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun May 3 21:56:59 2009 +0200

    Imported Upstream version 0.5+svn20090420-unstripped

commit 19a82c9fe63893e120ae5b29d0fce06b0dd5c613
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun May 3 20:05:43 2009 +0200

    relax the dependencies of the -dev packages a bit
    
    Before the -dev package depended on the exact build version. Now this is
    weakened to a version range between the build versions and
    ${source:Upstream-Version}-99, so that every later version up to the
    next upstream version still matches.
    
    Strictly speaking this is only necessary for the -unstripped
    variants. If some problems arise because of too weak dependencies, this
    decision can be reconsidered.

commit b354a9a0cc9d6b260f231c829489d4c9339ff4dd
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat May 2 10:55:26 2009 +0200

    update debian/changelog

commit 7f21d03eeb31cccda82b5a292a25f86162e0c4b4
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat May 2 10:54:28 2009 +0200

    be more careful with svn:externals in get-orig-source.sh
    
    the ffmpeg 0.5 release branch used to contain an svn:external to
    libswscale. However, the branch was changed to include libswscale rather
    than reference it. The problem in the script is that it fetches the
    svn:external information from the HEAD revision of the branch rather
    than the revision that is being checked out. This patch fixes the issue.

commit d99c32647a7e4a8edb9820e1bafbcbf1febd18e5
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat May 2 10:39:29 2009 +0200

    allow -dev packages be installed with the unstripped variants
    
    Discussion points:
      http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=526007
      https://bugs.launchpad.net/ubuntu/+source/ffmpeg/+bug/312898

commit eb4e01edb83f35e98339c22bbe14693e79486763
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat May 2 09:10:25 2009 +0200

    update debian/changelog

commit 0c1039e68078b4d9f7779bdc8d3cc8f32a5322d3
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat May 2 09:05:31 2009 +0200

    install the upstream license file and release notes

commit bb0311769cc6eaa683be802cd798d5d13e6aeef5
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat May 2 09:03:58 2009 +0200

    remove reference to 020_visibility_patch
    
    i don't plan on continuing that patch myself right now. needs to go via
    upstream anyway.

commit f0ab39269ce873f7fb1a8030eff39840f22dfb87
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat May 2 08:56:27 2009 +0200

    also cleanup build-doxy-stamp and the EXTRA file

commit f7c8ca3b4ae2c738c3a50d3dd24dc4bb480bab83
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat May 2 08:53:26 2009 +0200

    fix ffmpeg version identification string
    
    by creating snapshot_version in the build directories instead of the top
    source directory, the makefile will create a more sensible version.h file.
    
    Compare:
    
    FFmpeg version git-1d37261-4:0.5+svn20090420-1, Copyright (c) 2000-2009 Fabrice Bellard, et al.
    
    to
    
    FFmpeg version SVN-r18630-4:0.5+svn20090420-1, Copyright (c) 2000-2009 Fabrice Bellard, et al.

commit 1d3726176c1d586f722546b6e5ac581f7d4ed694
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Apr 26 22:46:23 2009 +0200

    debian/rules: bump epoch to '4'

commit 0aec4e9edeb0d49d03e2e9e9a4827fea48c48973
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Apr 26 22:31:17 2009 +0200

    remove debian/005_release_branch_changes.diff
    
    not necessary anymore

commit 1eb61dd177a96a82c16fc1dd0cea94eaa8640af8
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Apr 26 21:28:56 2009 +0200

    update debian/changelog

commit c44375463203277ee6571211d8f24426c29b16e3
Merge: b683843 3b380f6
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Apr 26 21:18:19 2009 +0200

    Merge commit 'upstream/0.5+svn20090420'

commit 3b380f6dfe4b6e092f883f108c80ad9da4eaa9bc
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Apr 26 21:18:13 2009 +0200

    Imported Upstream version 0.5+svn20090420

commit b683843a9c6ff9aa634b93971117c863314e7d03
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Apr 26 21:18:04 2009 +0200

    update README.upstream-upgrate for new versioning scheme

commit c96343b51877a5ab3fd00f542f0d913da6ad2188
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Apr 26 21:10:24 2009 +0200

    create right filenames for the orig.tar.gz files
    
    the new versioning scheme requires the filenames for upstream sources to
    be renamed.

commit bbe8f8e5b3cdb1ffa147113656ee873ca4e08b09
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Apr 26 21:04:11 2009 +0200

    fixup get-orig-source rules in debian/rules
    
    with the new versioning scheme, the regex needed to be adjusted. While
    doing that, a minor sanity check is added so that mistakes get detected
    earlier here.
    
    (also, the debian/get-orig-source.sh invocation lacked a ' ' to work)

commit b2be8b7831713093b27ee635381314f0b1203986
Merge: acf4eb9 f8b1a9f
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Apr 26 15:54:16 2009 +0200

    merge with Loïc's arm related changes

commit f8b1a9fbc9bbf27971cafb57cde4c306b4e2d214
Author: Loïc Minier <lool at dooz.org>
Date:   Fri Apr 10 21:33:40 2009 +0200

    vfp CFLAGS: add "-mfpu=vfp -mfloat-abi=softfp"

commit 4d871facbd1b99625a61c1d2c929b3690d8daf82
Author: Loïc Minier <lool at dooz.org>
Date:   Fri Apr 10 21:34:42 2009 +0200

    Update changelog

commit 08d24c19d047e4c4cd12508e97cbfc06e9d2e96f
Author: Loïc Minier <lool at dooz.org>
Date:   Fri Apr 10 21:33:40 2009 +0200

    vfp CFLAGS: add "-mfpu=vfp -mfloat-abi=softfp"

commit f5c146d6de9d727f8cfc8fc187289e4eb41f4af6
Author: Loïc Minier <lool at dooz.org>
Date:   Fri Apr 10 17:59:18 2009 +0200

    Generate changelog

commit 3bb8d60789b9221c91cbec488be221e435502eba
Author: Loïc Minier <lool at dooz.org>
Date:   Fri Apr 10 17:53:57 2009 +0200

    Enable vfp pass on armel; leave the neon disabled
    
    Enable vfp pass on armel; the neon one remains disabled because it
    deadlocks Babbage hardware.

commit 59fdd5957bc1067db25ef5c2d61003212662a32a
Author: Loïc Minier <lool at dooz.org>
Date:   Fri Apr 10 17:47:03 2009 +0200

    Add neon and vfp flavors to armel disabled for now
    
    Add neon and vfp flavors to armel; disabled for now as glibc hwcaps
    support needs to be merged first.

commit 19f49201c30d31ef647889e3539aa9f117b0e692
Author: Loïc Minier <lool at dooz.org>
Date:   Fri Apr 10 17:46:13 2009 +0200

    Disable more autodetecter ARM arch features
    
    Also disable --disable-armv6t2 --disable-armvfp --disable-neon as these
    might get turned on if our buildds are upgraded.

commit 07fc4e3bed9779decaa5d15ccbe4226b4e8cd46c
Author: Loïc Minier <lool at dooz.org>
Date:   Fri Apr 10 17:47:03 2009 +0200

    Add neon and vfp flavors to armel disabled for now
    
    Add neon and vfp flavors to armel; disabled for now as glibc hwcaps
    support needs to be merged first.

commit 954b94baee102334e58440cad77b3bd78ec6a86f
Author: Loïc Minier <lool at dooz.org>
Date:   Fri Apr 10 17:46:13 2009 +0200

    Disable more autodetecter ARM arch features
    
    Also disable --disable-armv6t2 --disable-armvfp --disable-neon as these
    might get turned on if our buildds are upgraded.

commit acf4eb93de5317e539939082b987d85ea24ab03a
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Mar 13 08:48:07 2009 +0100

    update debian/changelog

commit 141d8c571fc188d4247f95c6d17b55ea9474fa04
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Mar 22 11:21:12 2009 +0100

    update upstream svn server url
    
    No-op change for now, but svn.ffmpeg.org is more "official" than
    svn.mplayerhq.hu.

commit a0c94bdaf6954bb92e836b707bf0ba312c15356a
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Mar 15 23:15:46 2009 +0100

    update section names in control file
    
    ffmpeg-dbg -> 'debug'
    ffmpeg -> 'video'
    
    See http://permalink.gmane.org/gmane.linux.debian.devel.announce/1341
    for details.

commit 2bf25ca3a6f8a3036fa1773a4e8e7f3e54b74bd2
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Mar 13 09:26:19 2009 +0100

    add epoch for the unstripped packages
    
    patch imported from the 'unstripped' branch

commit 90eaf9de085270e5aaf79a58f7bb8d14c1ef7e0d
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Mar 13 08:47:53 2009 +0100

    beautify identification string

commit b088cc317f4eb7ee34c9e87326356fe53e041532
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Mar 13 09:24:33 2009 +0100

    add a git-buildpackage config file at debian/gbp.conf
    
    VLC already use this place and this way a lintian warning is avoided. So
    let's do that in ffmpeg as well.

commit ceb4ce790bad0b36e8c0604105b59c5f607ac399
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Mar 21 14:55:58 2009 +0100

    update debian/changelog

commit c44447fbeb0ab8608cd218ade5b21f57bcb084a3
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Mar 21 14:55:23 2009 +0100

    actually redisable ffserver in the package...

commit 83bf1e2d34fc48921af92e59cfbdc81ab291a9a9
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Mar 21 14:52:47 2009 +0100

    update debian/changelog

commit dc2c88ab48cf859de5b2287d50c6648002ed3d9a
Author: Colin Watson <cjwatson at ubuntu.com>
Date:   Thu Mar 19 17:26:36 2009 +0000

    Imported Debian patch 0.svn20090303-1ubuntu2

commit cbdb396ca969592dbb96d9aee1b6380bd4f65c66
Merge: c064087 29734a4
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Mar 21 14:30:44 2009 +0100

    merge from ubuntu.jaunty branch

commit 29734a4aaf3089cdb3ce86c94977528b601a5570
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Mar 21 14:29:19 2009 +0100

    update debian/changelog

commit 85bcdb9183eb7dcf368a042fd7cc06220d39fe79
Merge: 605983f f8691a0
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Mar 21 14:28:36 2009 +0100

    don't disable ffserver in specialised flavors. Fixes LP: #345370

commit f8691a0c8b0e04eda2bc6ee99a0abafb749fb1f9
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Mar 21 12:01:55 2009 +0100

    fix upload target

commit e559ebcbdf9cebd71609d5b4656a18ee8a978c36
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Mar 21 11:19:11 2009 +0100

    update debian/changelog

commit 79625c2918fd27bd3be1353a25b9ba3813573647
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Mar 21 11:18:39 2009 +0100

    don't disable ffserver in specialised flavors, fixes LP: #345370

commit f8f59e3b5898e7e34e7e936650be66fce7bf7e48
Author: Fabian Greffrath <fabian at debian-unofficial.org>
Date:   Fri Mar 13 17:02:28 2009 +0100

    Explicitely mention that no decoders are disabled in our packages.

commit c06408719e80b8d330b486ff3260d94c18d36e9b
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Mar 13 09:19:45 2009 +0100

    update debian/control

commit f18d2c7a2c056b963db5ff80b693cee47a4e7dff
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Mar 13 09:18:44 2009 +0100

    update debian/changelog

commit c3d1e5152119d4635e086e7af597695003b0509c
Merge: eb1e1bf 605983f
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Mar 13 09:17:41 2009 +0100

    merge from ubuntu.jaunty branch

commit 605983f3f1ba8a21a0c7c51700427db46cc662cd
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Mar 13 09:04:29 2009 +0100

    add git-buildpackage config file

commit e299a39a72ae634849133b9ed4cab0f34909d40a
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Mar 13 09:04:09 2009 +0100

    merge in changes from the ubuntu 'unstripped' branch

commit e6bb32f2a3b69d0655523a0de0378a23f0f79481
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Mar 13 08:56:23 2009 +0100

    update debian/changelog

commit d4f0bccc5ab8037b6fa9763cfacf6f285254ac9f
Merge: 15e8bea 3d2ab01
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Mar 13 08:53:09 2009 +0100

    merge from debian/unstable

commit 38ec00a8981509282dbff2ec39bebc269a9786e3
Author: Fabian Greffrath <fabian at debian-unofficial.org>
Date:   Fri Mar 13 08:34:32 2009 +0100

    Remove install rule for patents.txt

commit 1b87bf258060ea0928e856351ad1bed91cef8877
Author: Fabian Greffrath <fabian at debian-unofficial.org>
Date:   Thu Mar 12 15:32:56 2009 +0100

    Reorder some confflags to account for GPL licensed libraries.

commit 0d6c728aa0f3b3257cdc5e92f9547a3edf433e6f
Author: Fabian Greffrath <fabian at debian-unofficial.org>
Date:   Thu Mar 12 14:49:48 2009 +0100

    Remove patents.txt

commit 419d701b2431ee78c8e802aa4c181740c15dc773
Author: Fabian Greffrath <fabian at debian-unofficial.org>
Date:   Thu Mar 12 14:49:24 2009 +0100

    Merge the contents of patents.txt into README.Debian and change some paragraphs to (hopefully) add some more clarity on the removed encoders and the package naming scheme. Based on suggestions by Xavier Douville <debian at douville.org>, thank you very much for the review.

commit eb1e1bf1884686329edb921a6c6bb75c60b16c51
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Mar 9 18:31:21 2009 +0100

    add git-buildpackage config file

commit 6a3faf9b3338b415d96b949167145745fbde6544
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Mar 9 18:27:25 2009 +0100

    add conflicts replaces for libavfilter0, LP: #322570

commit a98a6eb1782d28cc6c4b0085daf288fb447ebb72
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Mar 7 20:17:27 2009 +0100

    add config for git-buildpackage in this branch

commit 89bb0bce8f653c58383cbde57efed5426acf58a3
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Mar 7 20:15:46 2009 +0100

    prepare upload to my PPA

commit 993e32d06190c9596fab63f49587a382a52c0292
Merge: 8e60bb8 3d2ab01
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Mar 7 20:10:09 2009 +0100

    Merge branch 'master' into ubuntu.intrepid.ppa

commit 6de2c65bba659ca881db05e319ba8c4d7858af13
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Mar 4 10:01:07 2009 +0100

    fix typo in amr-nb check
    
    the header is installed in /usr/include/amrnb/sp_dec.h, not in
    /usr/include/amr/sp_dec.h. This fixes the detection and actually enables
    libamrnb

commit 184309805713cf36bcefff91232d75fe5ae3734b
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Mar 4 09:56:44 2009 +0100

    finalize changelog

commit 25fc70e09b9fe85c17e0848251f8bf008b5ce723
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Mar 4 01:10:47 2009 +0100

    conditionally enable amr libs
    
    since the amr produce an actually unredistributable package, configure
    also requires the switch 'enable-non-free'. Therefore we need another
    variante of the enable_cond macro that also adds --enable-nonfree.
    
    Caveats: This approach adds the line --enable-nonfree twice. This is
    however only cosmetics, and not a real problem

commit a7aeed38f270f765a4316aef7e343b0c8f3d07e0
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Mar 4 01:00:29 2009 +0100

    add build dependencies not found in debian
    
     - libamrnb-dev
     - libamrwb-dev
     - libfaac-dev
     - libx264-dev
     - libmp3lame-dev

commit 40bbcdfdc5c85c5df8cce6b6ef6118d5262cf1a6
Merge: a28e704 3d2ab01
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Mar 3 22:59:59 2009 +0100

    Merge branch 'master' into master.unstripped

commit 3d2ab017eb235bd9ed9d9ec3ab895ef751ab1557
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Mar 3 21:24:03 2009 +0100

    prepare debian/changelog for the next upload

commit b158cf8f3d412d591ab524dbe4f5f77a83619b6f
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Mar 3 22:34:39 2009 +0100

    no longer call configure with --enable-xvmc
    
    this option has been removed upstream.

commit c4414253390c0a3d376ec983e071e531a80f1ba4
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Mar 3 21:06:40 2009 +0100

    bump shlibs version
    
    a few functions have been deprecated and new codecs and formats have
    been added, which warrants the shlibs bump.

commit a1260c3919b5c77ad3a935f937d4023004579bab
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Mar 3 20:59:43 2009 +0100

    remove unapplied patches
    
    in case we want to work on it, we can retrieve them at any time from the
    git history

commit a8e4d8f4734a455958b28cb9107d4ada7df55802
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Mar 3 20:58:21 2009 +0100

    Include changes done to the release branch
    
    since get-orig-source.sh cannot checkout arbitrary svn revision, the
    "missing" revision need to be carried with quilt patches. Improvements
    to get-orig-source.sh are welcome, but highly non-trivial.

commit a28e704dbe7ffa9113c58c9d5e0348f9a856d553
Merge: efe103a 5dfae05
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Mar 3 20:51:43 2009 +0100

    Merge commit 'upstream.unstripped/0.svn20090303-unstripped' into master.unstripped

commit 5dfae050a96a5c0f7a6850459c268da4b128d805
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Mar 3 20:51:37 2009 +0100

    Imported Upstream version 0.svn20090303-unstripped

commit bd8c7420cca972253c7a423f58cb99a72458e41b
Merge: 81b10cd 6397707
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Mar 3 20:51:33 2009 +0100

    Merge commit 'upstream/0.svn20090303'

commit 6397707ad6610520e1967e88fd71f80ada661174
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Mar 3 20:51:21 2009 +0100

    Imported Upstream version 0.svn20090303

commit 81b10cd676bacf9ad9bac43d7eeeb7d39c310cbe
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Mar 3 20:37:11 2009 +0100

    track the 0.5 release branch
    
    For the next upload to debian, we want to stay at the 0.5 release branch
    of ffmpeg. It is not too certain if and how long we will stay on this
    one, as this depends on the timeline to the next release and the
    (active) maintenance on this branch. But for right now, it is surely not
    worse than any other svn snapshot!

commit 932751dd7df335cd904e5f1b08ae7bc3fa2a8173
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Mar 3 14:57:30 2009 +0100

    further improvements to README.upstream-upgrade
    
    the checklist now contains all commands in a copy'n'paster compatible
    fashion. This makes it more trivial to test an upstream upgrade in a
    staging directory before doing this step in the 'production branch'.
    
    also the order was a bit changed. Now the 'master' branch is finalized
    before merging into the unstripped.master branch. This avoids
    unnecessary merges.

commit 100de95812ca1b74934a727f98512cf76c4dc3da
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Mar 3 07:54:42 2009 +0100

    improve get-orig-source.sh
    
    For the mplayer package, the support for dynamically looking for
    svn:externals was integrated. FFmpeg is now the last package that lacks
    this support, and since I like to consider tracking
    svn://svn.mplayerhq.hu/ffmpeg/branches/0.5 instead of
    svn://svn.mplayerhq.hu/ffmpeg/trunk, it seems pretty convenient to be
    able to change that url at a single place.

commit 9c9de606f7d021980a04a84a3575be9b80a541a2
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Mar 2 22:44:42 2009 +0100

    improve parallel builds on SMP/multicores
    
    On i386 and amd64, the system is asked for the number of online
    processors using the getconf utility. This can always be overriden using
    the DEB_BUILD_OPTIONS variable, as outline in section 4.9.1 in the
    debian policy.

commit 54f933b484d0365217cfcb7e68d7d7f291793131
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Mar 2 21:56:01 2009 +0100

    prepare new upload

commit efe103a454f8cb127ebea35ad4de1b3ad7f1422c
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Feb 25 12:39:18 2009 +0100

    add a git-buildpackage config

commit 2ad08326c025f0e96a4ae09a2d2bb97c33bb8773
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Feb 25 07:38:57 2009 +0100

    the new avformat52 now links against libavcodec52, which breaks
    applications that *ALSO* link against libavcodec51. Adding a
    Breaks: libavcodec51 should prevent this and (hopefully) closes: #516885

commit bc4a49cfa4145de56d78739482f42e13058f80b5
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Feb 23 14:26:21 2009 +0100

    fix typo in get-orig-source.sh

commit c3037644344bb5ab507ee9a75979d49f2b0a35b3
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Feb 23 13:48:14 2009 +0100

    remove suggests on liba52, ffmpeg has removed the wrapper

commit 5bb8bfcb3a80f47198196125121470ce0ce3e0cd
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Feb 23 12:46:46 2009 +0100

    fix the Vcs-Git urls to the correct locations

commit f10c0c763b6a220b08a9ac3eeefcfdc749c1e357
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Feb 22 09:33:18 2009 +0100

    update changelog

commit dc2b60b81530e0fb297549e277fd7af7e9a8fe4c
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Feb 22 09:26:29 2009 +0100

    fix postinst generation by calling dh_installdeb after dh_makeshlibs

commit fa65559997e9ce50c171171c0f923a2e6f599daf
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Feb 15 17:07:16 2009 +0100

    target unstable

commit a3685a23b94bff230dec812ff7069a7454b48d5b
Author: Fabian Greffrath <fabian at beppo.(none)>
Date:   Sun Feb 8 20:26:10 2009 +0100

    Forgot debian/control.{ffmpeg,ffmpeg-debian}, again...

commit 880bbd3a582b9e2d855ac2b2508cb1906c4d8242
Merge: a12c50b 44eb424
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Feb 6 15:25:20 2009 +0100

    add correct epoch in the "internal" shlibs generation

commit 44eb4246f61ca0eea2712bf1f1d3605f4be2718d
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Feb 6 11:06:03 2009 +0100

    update changelog

commit 310dccd758e75d2b825c3374c4a5fae96a9d5a4f
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Feb 6 11:05:13 2009 +0100

    add correct epoch in the "internal" shlibs generation

commit 1922b873d010175788f9caea43a8b550de1d4ea5
Author: Fabian Greffrath <fabian at debian-unofficial.org>
Date:   Fri Feb 6 10:03:00 2009 +0100

    remove libasound2-dev from build-depends on non-Linux archs

commit a12c50b8e6e3821c3b5cd5971eb19aa1d761f4d3
Merge: 4484aa0 15e8bea
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Feb 5 21:45:46 2009 +0100

    Merge branch 'ubuntu.jaunty' into ubuntu.jaunty.unstripped

commit 4484aa0d569ddcdb86e1da858616399d0b70ec66
Merge: f0556f0 974e11b
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Feb 5 21:40:17 2009 +0100

    Merge branch 'master.unstripped' into ubuntu.jaunty.unstripped

commit 15e8beab9fc08533b040bb9eac0afd9abefcf56e
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Feb 5 21:33:26 2009 +0100

    Merge branch 'ubuntu.jaunty.unstripped' into ubuntu.jaunty
    
    merge the changed build dependencies in: debian/control.ffmpeg

commit 7829f4e5adc8c98968872a32eff49cc8eea24957
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Feb 5 21:22:14 2009 +0100

    update debian/changelog

commit 503eb358200c6d6068b2398ee432d0dd3324f4fc
Merge: 678e3d9 16b4e33
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Feb 5 21:16:55 2009 +0100

    Merge branch 'master' into ubuntu.jaunty

commit 974e11b2a50baf8f0823dd1b893404849296d464
Merge: c28891f 16b4e33
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Feb 5 21:14:05 2009 +0100

    Merge branch 'master' into master.unstripped

commit 16b4e3385e52b517181838d12bebc4b97b5d8873
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Feb 5 20:33:04 2009 +0100

    update debian/changelog and prepare upload

commit bc85a9c1648269946731af2ce3e1fcb3f500fa92
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Feb 5 20:37:21 2009 +0100

    update debian/control

commit 5b90a7c84e78ba5626179eca2be4532d049cf71c
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Feb 5 20:18:27 2009 +0100

    add libxvmc-dev to build-depends in the 'ffmpeg' variant

commit aabe32a380dae5a24426d428cdf5af8598feac63
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Feb 5 20:17:56 2009 +0100

    add libasound2-dev to build-depends

commit 8fa40bde4f7428042ac11885753c7be5ff0fbd4f
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Feb 5 20:15:04 2009 +0100

    use test(1) instead of stat(1) for checking header file existance in
    cond_enable macro.

commit 714f7018c7473603aee62889bfa187542793b88f
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Feb 5 11:20:19 2009 +0100

    add epochs for the "internal" shlibs dependencies

commit c28891f2a79f19d43dc8192658e03aa3c8a639f2
Merge: 274299e 45fb5c2
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Feb 4 14:33:36 2009 +0100

    Merge branch 'master' into master.unstripped

commit 274299e19f80a1b14481455f2686a9ea29e562d1
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Feb 4 14:31:57 2009 +0100

    New Upstream Version

commit 194f24487872c4beb39270086dae4cbbbd941142
Merge: bdfec8e c44c893
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Feb 4 14:31:15 2009 +0100

    Merge commit 'upstream.unstripped/0.svn20090204-unstripped' into master.unstripped

commit c44c893a55a0ab02d8b97b98cba1879ab5e92318
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Feb 4 14:31:09 2009 +0100

    Imported Upstream version 0.svn20090204-unstripped

commit 45fb5c23c19f5d9365f73695c552d7adc00218cf
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Feb 4 14:28:35 2009 +0100

    remove 50_TKADV2009-004.diff, merged upstream

commit 884eb01a95e8d2602265f275642e3d799f958f76
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Feb 4 14:27:56 2009 +0100

    update debian/changelog for new upstream revision

commit 0eeb62060c9e428b14118ddfcd9995809c611ceb
Merge: e51c41b dfc4737
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Feb 4 14:22:41 2009 +0100

    Merge commit 'upstream/0.svn20090204'

commit dfc4737463a74710b568c8a429697a85a4728bc8
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Feb 4 14:22:34 2009 +0100

    Imported Upstream version 0.svn20090204

commit e51c41b17e1f4f812588dc469a75bda999e974ee
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Feb 4 10:18:40 2009 +0100

    remove spurious ','

commit 5d7f7913493936542f6ce9facbb7d3a90ec7ca9c
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Feb 4 10:14:30 2009 +0100

    updates and fixes with a dryrun on fuddl at debian.org's laptop.

commit 1205bb54a651aefeca1cf316c2471eaa6cdc68ff
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Feb 4 09:10:55 2009 +0100

    document how to upgrade to a new usptream version properly
    
    this is how I do upstream upgrades of ffmpeg. The instructions are both
    for my personal reference, but also that other team members and
    downstream distributions can update ffmpeg themselves.

commit bdfec8e95b95bfbd89069336649525ed2451f966
Merge: 849634c 6d5999c
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Feb 3 11:30:39 2009 +0100

    Merge branch 'upstream.unstripped' into master.unstripped
    
    The branch master.unstripped must contain the contents of the unstripped
    tarball so that this branch makes sense at all.

commit 6d5999cb8a87dadee203c35a48ddb9e45743fbba
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Feb 3 11:25:00 2009 +0100

    Imported Upstream version 0.svn20090128-unstripped

commit 849634cb3540a044828b516842d4f9ede400af5a
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Feb 3 09:54:37 2009 +0100

    regenerate debian/control

commit 47d8497be980d58abb64f5f4405133a437f6b75d
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Feb 3 09:23:32 2009 +0100

    rebuild using a clean, uncrippled ffmpeg tarball

commit 69d6aba1187b87f31dc2a99dc2d6e6abf107e82d
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Feb 3 09:24:51 2009 +0100

    really remove breaks field from source file, not only from
    debian/control

commit 4e4cf2c3daa81afb0d059f12e692e0342da7b618
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Feb 3 07:29:34 2009 +0100

    whitespace cleanups

commit b1f5ab04eb38a1d90744974e55b1a16fe74cebf8
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Feb 3 07:28:59 2009 +0100

    install ffpresets in /usr/share/ffmpeg/. Currently only presets for x264 are avaiable, so a libx264 enabled libavcodec (like libavcodec-unstripped-52) is needed to actually use them.

commit afa4f58d4bc3258f47941b9ace31c471299c9b15
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Feb 2 12:08:31 2009 +0100

    bump shlibs
    
    Actually no other package should use them yet, but let's better play
    safe here...

commit 29ed32ee3b187bddb2dac5395f1715f4c61199fc
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Jan 28 22:51:03 2009 +0100

    add 50_TKADV2009-004.diff to fix remotely exploitable security issue.

commit 64ccbc5056ceda012489742eb8c4ff048c3f0518
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Feb 2 12:07:20 2009 +0100

    remove breaks from libavcodec
    
    ff_gcd has been reintroduced, so it does no longer break libavcodec51

commit df58235f9169049b8e5057d3b669aab968d4f35f
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Feb 3 00:27:15 2009 +0100

    Update debian/changelog

commit f183f8aa9146e459f3a70fa729d001fe041a62c9
Merge: 4412df3 7bfce9e
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Feb 2 23:31:40 2009 +0100

    Merge commit 'upstream/0.svn20090128' into master.20090128

commit 4412df36e38804d24bdaf72f39fcfbb478949282
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Feb 1 20:41:49 2009 +0100

    simplify debian/confflags by doing autodetection of headers:
    
    * simplify debian/confflags by doing autodetection of headers:
       - xvid.h
       - lame/lame.h
       - faac.h
       - x264.h
       - vdpau/vdpau.h
      Also remove the setting externalcodecs from DEB_BUILD_OPTIONS. The codecs
      will be enabled as soon as the headers are installed on the filesystem,
      so there is no need in enabling that seperately.

commit 8779c3ff10bfb56e0e909bf6139d7a54a9c809ec
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Feb 1 23:05:55 2009 +0100

    use install instead of cp to install some files.
    
    install -D does create directories...

commit cf489dac68cc31553a040a2253f2d8a88a6fe4f2
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Feb 1 22:10:53 2009 +0100

    no longer install dsputil.h. It exposes lots of function that are
    private to ffmpeg and may change on any new upstream revision. Please
    get in touch with the ffmpeg maintainers if you maintain packages that
    rely on that ffmpeg internal headers like this.

commit 11f3d4105d244d3eb7f382908c68e551908ca14c
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Feb 1 22:01:07 2009 +0100

    avoid scanning the .git subdirectory when running doxygen

commit 2ee24a5819c03007f37add72ade750d6296fed5c
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Feb 1 20:00:24 2009 +0100

    variable ubuntu is no longer needed

commit 9ec1a8cf5788cc178d44d34a577c786d42515cf9
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Jan 28 22:28:15 2009 +0100

    get-orig-source can be used as well, if the make variable SVN_VERSION is
    overwritten...

commit f2c21888b10cff4e59d1f85f4eb8d6a58527de58
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Feb 1 19:54:34 2009 +0100

    target experimental

commit f0556f08d33e684544439958e5ab400871ae5b2b
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Feb 1 18:46:03 2009 +0100

    add conflicts/replaces on libavfilter0. LP: #323789

commit 7bfce9e7b819fd434fb0273526fee0a6ff7e36f9
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Jan 28 22:41:41 2009 +0100

    Imported Upstream version 0.svn20090128

commit a1229f8ace3f5cf129685b26d9ef212637caa3b9
Author: Fabian Greffrath <fabian at debian-unofficial.org>
Date:   Wed Jan 28 15:10:58 2009 +0100

    Use an alternative approach to achieve strict internal dependencies by calling dh_makeshlibs twice in debian/rules instead of a debian/shlibs.local file.

commit b5c2d2d409e03c239ba1df50247516f73eff3669
Author: Fabian Greffrath <fabian at debian-unofficial.org>
Date:   Wed Jan 28 14:35:03 2009 +0100

    Damn, we have quite more than one debian/control* in ffmpeg.

commit 61f048de599887c0141954c4424aabf1ef5b04d9
Author: Fabian Greffrath <fabian at debian-unofficial.org>
Date:   Wed Jan 28 14:02:41 2009 +0100

    Enabled Speex decoding via libspeex.

commit 4098a63b848df080f1e26900f52441ec100bd5c2
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jan 25 23:25:15 2009 +0100

    Add breaks on libavutil on earlier versions of libavcodec and libavformat
    
    Again because of the ff_gcd -> av_gcd rename.

commit bd3f227812f40cf21db51e4bf4f6703d29c9557f
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jan 25 11:16:29 2009 +0100

    update changelog

commit 1454cfdcc1308d6ca67ba0f17eed643eca208e1d
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jan 25 11:14:29 2009 +0100

    generate alternate dependencies for the unstripped variants as well

commit 00958498a84af90af688e236c7450500e27f5c6a
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jan 25 10:58:15 2009 +0100

    loosen the depends in shlibs.local a bit
    
    we want to work around internal, not exposed API/ABI changes. Having the
    packages depend on the exact build is a bit too tight.
    
    this should still be strict enough to prevent bugs like #512844 and #512466

commit 36e813c1d4dca3ba9b8ce8738e7818cf48ba7b41
Author: Fabian Greffrath <greffrath at leat.rub.de>
Date:   Sun Jan 25 10:52:40 2009 +0100

    I have rebuilt the ffmpeg packages from experimental with the attached
    file as debian/shlibs.local.
    
    As a result the dependencies for e.g. the libavcodec52 package have
    changed from
    
    Depends: libavutil49 (>= 3:0.svn20081101-1) | libavutil-unstripped-49
    (>= 3:0.svn20081101-1), [...]
    
    to
    
    Depends: libavutil49 (= 3:0.svn20090119-1), [...]
    
    Then I have rebuilt a package depending on libavcodec-dev
    (alsa-plugins-1.0.18, because ffmpeg2theora FTBFS with the ffmpeg
    packages from experimental) against these newly created packages and its
    resulting dependencies are as before:
    
    Depends: [...], libavcodec52 (>= 3:0.svn20081101-1) |
    libavcodec-unstripped-52 (>= 3:0.svn20081101-1), [...]
    
    I have learnt two things from this experiment:
    
    - By introducing an shlibs.local file in the ffmpeg Debian package we
    make sure that the ffmpeg libraries only depend on other ffmpeg
    libraries that have the same binary:Version. External packages that are
    built against these ffmpeg libraries are not affected.
    
    - We can additionally make sure that the unstripped flavours of the
    libraries only depend on the unstripped flavours of the other ffmpeg
    libraries. For this the contents of the shlibs.local file has to depend
    on which packages we want to build. It will contain e.g. "libavutil 49
    libavutil49 (= ${binary:Version})" for the ffmpeg-debian version and
    "libavutil 49 libavutil-unstripped-49 (= ${binary:Version})" for the
    unstripped ffmpeg flavour.

commit e52aa37e9070c6b72bfa6601dc5e1aab17f6a9a6
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jan 20 17:51:27 2009 +0100

    finalize changelog

commit 2f568647e1f2dd1f269cd16d22dc554cffba3aec
Merge: 4e692e2 678e3d9
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jan 20 17:48:31 2009 +0100

    Merge branch 'ubuntu.jaunty' into ubuntu.jaunty.unstripped

commit 678e3d98cdfcf5472a8811d0cb19fe50d46fb3bb
Merge: 502fc18 141ca8c
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jan 20 15:07:20 2009 +0100

    Merge branch 'master' into ubuntu.jaunty

commit 141ca8c761c72939bc23245fa51341b99c2ff483
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jan 20 14:10:31 2009 +0100

    when creating formats.txt, print to stdout, so that it appears in the buildlogs

commit f4ccf7458557487275ecd8f8e51f0881a3552790
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jan 20 13:32:37 2009 +0100

    build against libxvmc

commit 53338f3d62d6099ee17dea3ced71e81d3350e904
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jan 20 13:29:12 2009 +0100

    simplify checking if libfaad is available or not

commit d3aeae532cace9e7f8c455fa01698feec18f659e
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jan 20 13:23:11 2009 +0100

    duplicate the for loop for shlibs generation.
    
    it seems that make doesn't like preprocessor statements inside the a
    multiline line.

commit 7d962edb872d7d2c17643983d0e7b58b80faa64c
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jan 20 12:50:19 2009 +0100

    update changelog

commit 1377b09e3f0413dcd12f8e146c6b56eca1b3a381
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jan 20 12:49:32 2009 +0100

    more branches to minimize the changes needed in the branches
    that ship the 'unstripped' variant

commit 4e692e2d78eace90096cdc0be5074d4d4b14ec6e
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jan 20 12:20:44 2009 +0100

    the unstripped variant unconditionally depends on the -unstripped-
    versions in the shlibs

commit e760c40dcc04be51457e65e520595ca559761564
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jan 20 11:24:00 2009 +0100

    install formats.txt in libavcodec-unstripped-52

commit b8027915b1323b955c3ebecf5b7ec1301b9cad0b
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jan 20 11:23:43 2009 +0100

    fix LD_LIBRARY_PATH also for generation of formats.txt

commit fe2e1f9475b654f39b9d7b11119c1344abd5f3db
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jan 20 11:18:14 2009 +0100

    tighten build dependency in x264 even more...

commit 0e20de49fc3448107a6790c61f5bd49594384497
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jan 20 11:06:45 2009 +0100

    actually --enable-libx264

commit eb47be354588b9da7486a8ba1d6f52ed320f93f7
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jan 20 10:02:50 2009 +0100

    update debian/changelog

commit f11f172242781e9e9ddb603afb32aa7173e7efc8
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jan 20 10:12:21 2009 +0100

    update build dependencies
    regenerate debian/control

commit 79b09422c84a19b9d79298014e8e0531652ec8da
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jan 20 10:10:39 2009 +0100

    enable xvmc and vdpau on i386 and amd64

commit ff5dfaefcdb65238360d3c7c7e28072904ffe4ce
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jan 20 10:07:21 2009 +0100

    add libx264-dev build dependency

commit db01c1b92a662fff2cb3064dbadd0c607eb909ae
Merge: 2cfe809 502fc18
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jan 20 10:01:02 2009 +0100

    Merge branch 'ubuntu.jaunty' into ubuntu.jaunty.unstripped

commit 2cfe8096cae285e3bf95805ffa28061ecbde8e83
Merge: ca2fe99 05c2fba
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jan 20 09:58:34 2009 +0100

    Merge commit 'upstream.unstripped/0.svn20090119-unstripped' into ubuntu.jaunty.unstripped

commit 05c2fbac217f458dfe78de290a010a165b49c217
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jan 20 09:56:58 2009 +0100

    Imported Upstream version 0.svn20090119-unstripped

commit ca2fe9969b133148cfad84308aa0fe6644a763da
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Nov 15 19:50:42 2008 +0100

    Imported Debian patch 0.svn20081115-1ubuntu1+unstripped1

commit 2a6d7298ea493d24a0804aafbd6919f867475850
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jan 20 09:50:14 2009 +0100

    Imported Upstream version 0.svn20081115-unstripped

commit 502fc1809d98d47ec4bc1f4553871a91056fc960
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jan 20 09:21:31 2009 +0100

    update debian/changelog

commit df918b526f72da30d00e4b66142b6fff05c9dd84
Merge: 42c50e0 2236cc3
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jan 20 09:18:26 2009 +0100

    Merge branch 'master' into ubuntu.jaunty

commit 2236cc3cfbbb61fbbc8fbba5f338402cba4d3396
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jan 20 09:03:06 2009 +0100

    typo in debian/changelog

commit 512a6a52a92a13dde0cb0692823e38f52cc63fcd
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jan 20 00:43:33 2009 +0100

    append LD_LIBRARY_PATH, do not overwrite it.

commit 42c50e04ded40ab3ca7c3bc81f004b98b1d34350
Merge: c8154f4 0bee82e
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jan 20 00:15:26 2009 +0100

    Merge branch 'master' into ubuntu.jaunty

commit 0bee82e4ee8c715bb21d3c02f9b1d5e121a2682a
Author: Reinhard Tartler <siretart at faui44a.informatik.uni-erlangen.de>
Date:   Mon Jan 19 23:23:17 2009 +0100

    fix fixup-config.sh to match upstream changes
    
    upstream has decided that the defines ENABLE_*_ENCODER need to be
    renamed to CONFIG_*_ENCODER.

commit 46aab4dcf306df0e8afc942861ce64c655785e94
Author: Reinhard Tartler <siretart at faui44a.informatik.uni-erlangen.de>
Date:   Mon Jan 19 23:03:10 2009 +0100

    new upstream version

commit 62d9d4d55277e50b89cd2776eba4454adc851aa2
Merge: e72bcc9 9b722ed
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Jan 19 22:37:35 2009 +0100

    Merge commit 'upstream/0.svn20090119'

commit 9b722ed9d5ca3b3224f09f2d5fabf8270e55e068
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Jan 19 22:37:27 2009 +0100

    Imported Upstream version 0.svn20090119

commit e72bcc91bfb4afd377a5048b4ad961db2b31d0cc
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Jan 12 21:31:08 2009 +0100

    simplify the process of updating a new upstream revision
    
     - stamp the used svn revision in ffmpeg/.svnrevision and
       ffmpeg/libswscale/.svnrevision
     - always generate both tarballs
     - adapt debian/rules
     - calculate svn revision in the ./configure parameter

commit 53bdeac3b9e84ac757c98f94891593d52eded7c5
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Jan 12 14:09:50 2009 +0100

    add some notes on how to do an upstream-upgrade next time correctly

commit 8de5a250b832720467e0a776af1b0099d65bc07e
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Jan 12 07:44:16 2009 +0100

    remove debian/.bzr-builddeb/default.conf, no longer useful

commit 0eb962a8e70654fd9aa04df3d99d61e912ace6a6
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Jan 12 07:43:42 2009 +0100

    update Vcs-Git tags. Packaging has now moved to git

commit c8154f407ff6814a89e113aa39876bfa01142840
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Nov 15 19:44:29 2008 +0100

    Imported Debian patch 0.svn20081115-1ubuntu1

commit 8e60bb8d9ce83673126e849036adb6ef3a3ec3d1
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Nov 10 10:58:01 2008 +0100

    Imported Debian patch 0.svn20081108-1ubuntu3

commit 974235a5b5af022df22d53a96cba3a7c7bc0635e
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Nov 10 10:31:47 2008 +0100

    Imported Debian patch 0.svn20081108-1ubuntu2

commit 9e9abbd0d46a92bdc7d59b710d4322448e9b05e9
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Nov 10 07:31:16 2008 +0100

    Imported Debian patch 0.svn20081108-1ubuntu1

commit 67aa45c9b2909cad471c93a5eeb51f04d2f86f5b
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jan 11 22:45:15 2009 +0100

    install formats.txt in the libavcodec52 package to document what formats
    this version of ffmpeg has enabled.

commit 712ca1eaa2906f10c130c9a9466db344a4d43654
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jan 10 16:55:20 2009 +0100

    disabled patch 020_visibility_patch. It needs to be adapted to the new
    upstream changes. Hopefully it will get merged into ffmpeg properly.

commit c6afaca1cf89611006da8b82fbd317c30fe69725
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jan 10 16:52:04 2009 +0100

    remove 050_fix_pkgconfig_files.patch
    
    it has been merged upstream

commit 980136de1d50c2534f567016a4ffc9a6f5af35f1
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jan 10 16:48:50 2009 +0100

    update debian/changelog

commit f00c4d810a8d3f655889c56d54e740f4a0771e4f
Merge: 38acc8d 0e69dce
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jan 10 16:44:10 2009 +0100

    Merge commit 'upstream/0.svn20090110' into master_staging

commit 0e69dce4f29f262d94a4e46014aea5a35fb5e854
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jan 10 16:44:07 2009 +0100

    Imported Upstream version 0.svn20090110

commit 38acc8d1eec6739d7e0dee0cdd12ff0cde1163a7
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jan 10 16:39:52 2009 +0100

    new upstream svn snapshot (svn revision 16508, libswscale revision 28286)

commit df1b5fe3334d35fe8e483052d1e6cecdcdcfbe44
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Nov 15 13:55:04 2008 +0100

    git-debimport ffmpeg-debian_0.svn20081115.orig.tar.gz

commit 7ea08d0db2cc13ac0959708eab11a6c09dd56d97
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Nov 10 21:37:16 2008 +0100

    git-debimport ffmpeg-debian_0.svn20081115-1.diff.gz

commit 72338962aa1b249eb6404c6c6063c7c317b88cb2
Merge: 4ff78b2 df1b5fe
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Jan 9 15:37:27 2009 +0100

    Merge branch 'upstream'

commit 4ff78b204fb4dd13a38f4614b40dbe248d055181
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Nov 8 16:38:23 2008 +0100

    git-debimport ffmpeg-debian_0.svn20081108-1.diff.gz

commit 67b557963b975a9555e4bbbd9037a15c0362f36b
Merge: 74c6b2e dd1675d
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Jan 9 15:37:23 2009 +0100

    Merge branch 'upstream'

commit dd1675d47d3b1f4f29f40a20ee474129178e87e8
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Nov 8 13:52:13 2008 +0100

    git-debimport ffmpeg-debian_0.svn20081108.orig.tar.gz

commit 1ed4bd91ef56bd80f4c5108988a43de7fded91e1
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Sep 25 21:02:26 2008 +0200

    git-debimport ffmpeg-debian_0.svn20080925.orig.tar.gz

commit 74c6b2e29329ddbce5f7af249b995a48a859b959
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Sep 6 20:07:01 2008 +0200

    git-debimport ffmpeg-debian_0.svn20080925-1.diff.gz

commit b5fd2c068b1ecabe3678dfdf88f0b6db83c3bb2d
Merge: 0f5912f 1ed4bd9
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Jan 9 15:37:17 2009 +0100

    Merge branch 'upstream'

commit 0f5912fe2bb5e0ec825ad0f787983a282d6e1a4c
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Oct 3 14:13:54 2008 +0200

    git-debimport ffmpeg-debian_0.svn20080206-14.diff.gz

commit 19e4a2ac50a17b70c5a1b9b7bb9e1387279c870e
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Sep 21 17:03:50 2008 +0200

    git-debimport ffmpeg-debian_0.svn20080206-13.diff.gz

commit e9f67ddf3080922af5a5d9a10b1909304455674c
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Aug 23 10:49:10 2008 +0200

    git-debimport ffmpeg-debian_0.svn20080206-12.diff.gz

commit f2ca784454881cf59f48b3cd726e07bf1af444b3
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Jul 16 10:41:49 2008 +0200

    git-debimport ffmpeg-debian_0.svn20080206-11.diff.gz

commit 2b5bfc9b7ca869d0075c7ba5fcc3bd967eeb7540
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Jul 9 14:04:06 2008 +0200

    git-debimport ffmpeg-debian_0.svn20080206-10.diff.gz

commit 8cca2cfbb0bda046f74085544c6b2312a0bc3ba9
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Mon Jun 30 15:27:50 2008 +0200

    git-debimport ffmpeg-debian_0.svn20080206-9.diff.gz

commit f4b38fde143c957cb45cd8cf7749392b5e58465a
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Mar 20 19:10:59 2008 +0100

    git-debimport ffmpeg-debian_0.svn20080206.orig.tar.gz

-----------------------------------------------------------------------

-- 
libav-extra packaging



More information about the pkg-multimedia-commits mailing list