~ubuntu-branches/ubuntu/oneiric/libav/oneiric-security

Viewing all changes in revision 11.

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler
  • Date: 2011-08-26 11:12:43 UTC
  • mfrom: (1.1.10 experimental)
  • Revision ID: james.westby@ubuntu.com-20110826111243-8nly9srkqhb5oa0l
Tags: 4:0.7.1-3ubuntu1
* Merge from debian/unstable
  - don't build against libfaad, libdirac, librtmp and libopenjpeg,
    lame, xvid, x264  (all in universe)
* Drop extra conflicts on libswscale-extra-1

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: