Merge branch 'own-mxf' of /home/carl/git/dvdomatic into own-mxf

diff --git a/TODO b/TODO
index 171e2ee44bbc66ee651c4171aee77b52ed7131f9..93447029ca09e1a7be5ea805d47756580b4d6680 100644 (file)
--- a/TODO
+++ b/TODO
@@ -8,7 +8,6 @@ Nice error when trying to thumbnail with no content.
 Destroy _buffer_src_context / _buffer_sink_context
 Don't start later jobs when one breaks.
 Compute time remaining based on more recent information.
-Start frame later than ... error?
 Use lexical_cast more
 Do deps better
 

diff --git a/doc/mainpage.txt b/doc/mainpage.txt
index a944238bf828d74c37f0293d4d8e8aabbc496f9c..81c3b45583e9a073eca81651dad25828700a0e1a 100644 (file)
--- a/doc/mainpage.txt
+++ b/doc/mainpage.txt
@@ -13,10 +13,11 @@
  *  aspect ratio and apply FFmpeg filters.  The time-consuming encoding of JPEG2000 files
  *  can be parallelised amongst any number of processors on the local host and any number
  *  of servers over a network.
+ *
+ *  DVD-o-matic can also make DCPs from still images, for advertisements and such-like.
  * 
  *  Portions of DVD-o-matic are based on OpenDCP (http://code.google.com/p/opendcp),
- *  written by Terrence Meiczinger, and two of OpenDCP's command-line tools are called
- *  by DVD-o-matic.
+ *  written by Terrence Meiczinger.
  *
  *  DVD-o-matic uses libopenjpeg (http://code.google.com/p/openjpeg/) for JPEG2000 encoding
  *  and libsndfile (http://www.mega-nerd.com/libsndfile/) for WAV file manipulation.  It