Merge.

diff --cc TODO
index a5528c512d71a808ce892f643f265ab964bbe126,b3acf060026e3b802407a6c442faf77643282ae6..1239613ffa7100e179ad72f75948e013cb874f19
--- 1/TODO
--- 2/TODO
+++ b/TODO
@@@ -1,4 -1,6 +1,7 @@@
 +Write still j2ks straight to a MXF.
+ Seem to be problems when waiting for (failing) server threads at the end of an encode;
+ their frames aren't reprocessed locally.
+ 
  Standardise j2c/j2k
  Format name in ~/.dvdomatic screws up with spaces; use ID or something
  Thumbnails are poorly named