Merge branch 'video_gstreamer-only'

Conflicts: mediagoblin/db/migrations.py mediagoblin/submit/views.py
2011-11-21 21:51:30 +01:00
parent e56e5f8c5c c875bb74a8
commit b9e1fa280e
25 changed files with 2993 additions and 32 deletions
--- a/setup.py
+++ b/setup.py
@@ -66,6 +66,7 @@ setup(
        ## their package managers.
        # 'lxml',
        ],
+    requires=['gst'],
    test_suite='nose.collector',
    entry_points="""\
        [console_scripts]