-
Committer:
Bazaar Package Importer
-
Author(s):
Reinhard Tartler
-
Date:
2011-07-26 14:25:22 UTC
-
mfrom:
(1.2.5 upstream)
-
Revision ID:
james.westby@ubuntu.com-20110726142522-bt69axkvrp6mvprf
Tags: 2:0.116.2037+gitf8ebd4a-1ubuntu1
* Merge from debian (seriously!), remaining changes
- tighten dependencies on Libav 0.7
- Build against libffms2-dev
- build against libgpac-dev to enable .mp4 output
- allow parallel builds