moved from videoscale => ffvideoscale *and* put queus before video and audio pipes

[mediagoblin.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 9187e7380c1a6acd03c2954e8d27f23a5b2ff05f..5f16bd747eca8fb796f00e045ff1cdb389351a21 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -9,7 +9,10 @@ mediagoblin.egg-info
 *.pyc
 *.pyo
 docs/_build/
+docs/build
 user_dev/
+paste_local.ini
+mediagoblin_local.ini
 server-log.txt
 *~
 *.swp