← Back to branch summary

~timo-jyrinki/ubuntu/trusty/pitivi/backport_utopic_fixes

« back to all changes in this revision

Viewing changes to tests/test_factories_file.py

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2011-05-26 15:29:58 UTC
  • mfrom: (3.1.20 experimental)
  • Revision ID: james.westby@ubuntu.com-20110526152958-90je1myzzjly26vw
Tags: 0.13.9.90-1ubuntu1
* Resynchronize on Debian
* debian/control:
  - Depend on python-launchpad-integration
  - Drop hal from Recommends to Suggests. This version has the patch applied
    to not crash without hal.
* debian/patches/01_lpi.patch:
  - launchpad integration  
* debian/rules:
  - Use gnome.mk so a translation template is built

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_factories_file.py
220
220
        self.factory.addOutputStream(video2)
221
221
        self.factory.addOutputStream(audio)
222
222
 
223
 
        # We're no longer using ffvideoscale, so this check is obsolete. 
 
223
        # We're no longer using ffvideoscale, so this check is obsolete.
224
224
        # TODO: implement this functinality in smartscale, and test it
225
225
        # separately
226
226
        #if gst.registry_get_default().find_feature('ffvideoscale',