Merge branch 'master' into speed-up

diff --cc ChangeLog
index 716a130d7f0f783adf2d873640d1e031ca9ec2dc,6524aa3ed51afa6f731b72df8bc6dd0f91534fa1..e463d17c8dd53f27e9bdcfa3ab2c9aebf57f357b
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,12 -1,45 +1,54 @@@
+ 2012-12-13  Carl Hetherington  <cth@carlh.net>
+ 
+       * Version 0.64 released.
+ 
+ 2012-12-13  Carl Hetherington  <cth@carlh.net>
+ 
+       * Version 0.63 released.
+ 
+ 2012-12-13  Carl Hetherington  <cth@carlh.net>
+ 
+       * Re-fix reports of zero audio channels
+       with soundtracks of some source files.
+ 
+ 2012-12-13  Carl Hetherington  <cth@carlh.net>
+ 
+       * Version 0.62 released.
+ 
+ 2012-12-13  Carl Hetherington  <cth@carlh.net>
+ 
+       * Improve progress reporting during the final
+       DCP make job; should stop the bar sitting at 100%
+       for a while during digest creation.
+ 
+ 2012-12-11  Carl Hetherington  <cth@carlh.net>
+ 
+       * Version 0.61 released.
+ 
+ 2012-12-11  Carl Hetherington  <cth@carlh.net>
+ 
+       * More .deb dep tweaks.
+ 
+ 2012-12-11  Carl Hetherington  <cth@carlh.net>
+ 
+       * Version 0.60 released.
+ 
+ 2012-12-11  Carl Hetherington  <cth@carlh.net>
+ 
+       * Hopefully fix utterly broken partially-static
+       builds for .debs.
+ 
+       * Fix specification of architecture in .debs.
+ 
 +2012-12-10  Carl Hetherington  <cth@carlh.net>
 +
 +      * Add a check-box (which defaults to on) which tells DVD-o-matic
 +      not to scan new content files to work out their length, but instead
 +      to trust the length from the header.  This length only matters for
 +      working out what thumbnails to generate, so it isn't critical.
 +      Trusting the header will speed up the "Examine Content" job by
 +      a factor of about 2, which is handy for large films.
 +
  2012-12-10  Carl Hetherington  <cth@carlh.net>
  
        * Version 0.59 released.

diff --cc src/lib/ffmpeg_decoder.cc
Simple merge