-
Committer:
Gauvain Pocentek
-
Date:
2010-10-12 04:11:04 UTC
-
mfrom:
(5.1.15 maverick)
-
Revision ID:
gauvain@images-20101012041104-io0qspsbz3xnrlyi
* Merge from maverick.
* debian/control:
- update maintainer and uploaders
- use our addresses in Vcs-* fields
- build-depends on libfaac-dev, libopencore-amrnb-dev and
libopencore-amrwb-dev to add aac encoding and amr support lp: #490227
- recommends apport-hooks-medibuntu for lib*-extra-* to catch all bug
reports.
* merge changes from 'ffmpeg' package
* fix dependency on libswscale-extra-0, LP: #637895
* Add flic video patch. Fixes CVE-2010-3429
* Configure with --enable-pic on powerpc. LP: #654666.
* add libxfixes-dev to build-depends, LP: #631103
* weaken the dependencies for the -extra package