From 6e266e7628a45b0085da6517d534f4566d7a5c72 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sun, 30 Sep 2012 13:19:05 +0200
Subject: video encoder generation works

---
 src/test.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/test.json')

diff --git a/src/test.json b/src/test.json
index a3d71a3..f684e85 100644
--- a/src/test.json
+++ b/src/test.json
@@ -21,9 +21,9 @@
         "ogg-audio": { "muxer": "ogg", "audio": "vorbis" }
       },
      "profiles": {
-        "high": { "resolution": "720p25", "video": 2048, "audio": 160 },
-        "medium": { "resolution": "480p25", "video": 1024, "audio": 160 },
-        "low": { "resolution": "360p25", "video": 600, "audio": 96 }
+        "high": { "video": "720p25", "audio": 160 },
+        "medium": { "video": "480p25", "audio": 160 },
+        "low": { "video": "360p25", "audio": 96 }
       },
      "machines": {
        "titan": [ "input", "encoder-vorbis", "encoder-aac", "muxer", "streamer0" ],
@@ -41,8 +41,8 @@
    },
   "encoder": {
      "video": {
-        "h264": [ "720p25", "480p25", "360p25" ],
-        "vp8": [ "720p25", "480p25", "360p25" ]
+        "h264": { "720p25": 2048, "480p25": 1024, "360p25": 600 },
+        "vp8": { "720p25": 2048, "480p25": 1024, "360p25": 600 }
       },
      "audio": {
         "aac": [ "160@44", "96@44" ],
-- 
cgit v1.2.3