summaryrefslogtreecommitdiff
path: root/src/test.json
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2012-10-12 03:44:18 +0200
committerChristian Pointner <equinox@spreadspace.org>2012-10-12 03:44:18 +0200
commita890b9af739665472ec7e7fc031c8a00f57ef7cf (patch)
tree1c9089795b738f9c2ccf2f37bdbf328b992c48b1 /src/test.json
parentadded manager config (diff)
moved video resize and resample to sperate worker
Diffstat (limited to 'src/test.json')
-rw-r--r--src/test.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test.json b/src/test.json
index 3342167..48fcc18 100644
--- a/src/test.json
+++ b/src/test.json
@@ -32,7 +32,7 @@
"vp8": { "720p25": 2048, "480p25": 1024, "360p25": 600 }
},
"machines": {
- "titan": [ "input", "encoder-vorbis-160", "encoder-vorbis-96", "encoder-aac-160", "encoder-aac-96",
+ "titan": [ "input", "resample", "resize", "encoder-vorbis-160", "encoder-vorbis-96", "encoder-aac-160", "encoder-aac-96",
"muxer-flash-high", "muxer-flash-medium", "muxer-flash-low", "muxer-webm-high",
"muxer-webm-medium", "muxer-webm-low", "muxer-ogg-audio-high", "streamer-local1" ],
"calypso": [ "encoder-h264-720p25", "encoder-h264-480p25", "encoder-h264-360p25" ],