-
Committer:
Bazaar Package Importer
-
Author(s):
Reinhard Tartler
-
Date:
2009-08-26 11:20:03 UTC
-
mfrom:
(0.1.3 squeeze)
-
Revision ID:
james.westby@ubuntu.com-20090826112003-0bbg9pk2yi1zg8oq
Tags: 4:0.5+svn20090706-2ubuntu1
* merge from debian. Remaining changes:
- disabled output decoders: faad, openjpeg, dirac (all not in main)
- build arm vfp variant
- don't build depend on yasm.
* fix dependencies on -extra packages: LP: #418705, #416348
* no need to remove mpeg encoders in the ubuntu package, unless we hear
otherwise from some patent owner. This brings back the mpeg2video
encoder is available. cf. formats.txt.gz LP: #416585