← Back to branch summary

~ubuntu-branches/ubuntu/vivid/ffmpeg/vivid

Viewing all changes in revision 54.

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler
  • Date: 2011-02-13 20:04:06 UTC
  • mfrom: (0.2.13 sid)
  • Revision ID: james.westby@ubuntu.com-20110213200406-fpkbzhwo3r7xil5c
Tags: 4:0.6.1-5ubuntu1
* Merge from debian. Remaining changes:
  - don't build against libfaad, libdirac, librtmp and libopenjpeg (all in universe)
  - explicitly --enable-pic on powerpc, cf. LP #654666
  - different arm configure bits that should probably better be merged into debian

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: