Merge.

diff --cc ChangeLog
index b72b6ecf394becb284e05b4a404f5115097b568b,5d11597821e0290ebeef48b24a5c275952a33aaf..0d2988f1bc040d9ac55694ab1f8363cbe25f7f3d
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,15 -1,8 +1,20 @@@
+ 2012-08-10  Carl Hetherington  <cth@carlh.net>
+ 
+       * Untested fixes for failure to encode
+       content without audio.
+ 
 +2012-08-09  Carl Hetherington  <cth@carlh.net>
 +
 +      * Version 0.45 released.
 +
 +2012-08-09  Carl Hetherington  <cth@carlh.net>
 +
 +      * Fix bug with padding in Scope causing corrupt
 +      images.
 +
 +      * Fix bug when using content file names which
 +      start with the name of the film directory.
 +
  2012-08-05  Carl Hetherington  <cth@carlh.net>
  
        * Version 0.44 released.