From: Carl Hetherington <cth@carlh.net>
Date: Wed, 3 Oct 2012 20:25:04 +0000 (+0100)
Subject: Merge.
X-Git-Tag: v2.0.48~1718
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=3781be4da4601176d7bb954f9cc65621d75e7344

Merge.
---

3781be4da4601176d7bb954f9cc65621d75e7344
diff --cc TODO
index 221d2c285,bd5bc2008..0a120fa47
--- a/TODO
+++ b/TODO
@@@ -1,4 -1,24 +1,26 @@@
 +Look at http://liblqr.wikidot.com/en:manual
++
+ EC2
+ 
+ Small instance $0.085 ph
+ Sintel Trailer 1080p @ 200000 Mbps
+ 1247 frames @ 24fps ie 51.96s
+ Took 1h20 to encode
+ 
+ High-CPU medium $0.186 ph
+ Sintel Trailer 1080p @ 200000 Mbps
+ 1247 frames @ 24fps ie 51.96s
+ Took 23m to encode
+ 
+ High-CPU extra-large $0.744 ph
+ Sintel Trailer 1080p @ 200000 Mbps
+ 1247 frames @ 24fps ie 51.96s
+ 
+ 
+ Transfer in free
+ Transfer out $0.120 per GB
+ 
+ 
  Port DVD rip
  
  Write still j2ks straight to a MXF.