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

Viewing all changes in revision 52.

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler
  • Date: 2010-11-14 12:19:50 UTC
  • mfrom: (0.1.9 experimental)
  • Revision ID: james.westby@ubuntu.com-20101114121950-aobdksn789r5tnco
Tags: 4:0.6.1-1ubuntu1
* 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
* remove fix-CVE-2010-3429.patch, applied upstream

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: