Merge in 0.70 branch with 0.71 fix.

diff --cc ChangeLog
index 36bda83b42a7474b84b6f101ea1483b81939290a,4d1fe3423c52f0ef69fe2f6d060b7e0d4315d192..56a3804020d3feff31586a05b4ef5a08177f0fee
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,25 -1,11 +1,33 @@@
+ 2013-01-24  Carl Hetherington  <cth@carlh.net>
+ 
+       * Version 0.71 released.
+ 
+ 2013-01-24  Carl Hetherington  <cth@carlh.net>
+ 
+       * Fix lack of audio with trimmed DCPs.
+ 
 +2013-01-23  Carl Hetherington  <cth@carlh.net>
 +
 +      * Remove multi-reel support (for now); needs more thinking about
 +      and testing.
 +
 +2013-01-12  Carl Hetherington  <cth@carlh.net>
 +
 +      * Version 0.71beta2 released.
 +
 +2013-01-12  Carl Hetherington  <cth@carlh.net>
 +
 +      * Version 0.71beta1 released.
 +
 +2013-01-12  Carl Hetherington  <cth@carlh.net>
 +
 +      * Untested support for splitting DCPs
 +      into multiple reels.
 +
 +2013-01-09  Carl Hetherington  <cth@carlh.net>
 +
 +      * Try to build with 0.10.4-ish ffmpeg.
 +
  2013-01-07  Carl Hetherington  <cth@carlh.net>
  
        * Version 0.70 released.

diff --cc debian/changelog
index b8385a4b020bdd8db606901420891afab446bbc9,7bace15d1b9fadd9cafe0b0aaa597d7f3d9a06e6..b051ced3ab9c952aea52f6c7ba32d36df24bf63c
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,14 +1,16 @@@
- dvdomatic (0.71beta2-1) UNRELEASED; urgency=low
+ dvdomatic (0.71-1) UNRELEASED; urgency=low
+ 
+   * New upstream release.
+ 
+  -- Carl Hetherington <carl@houllier.lan>  Thu, 24 Jan 2013 11:36:04 +0000
+ 
+ dvdomatic (0.70-1) UNRELEASED; urgency=low
  
    * New upstream release.
 +  * New upstream release.
 +  * New upstream release.
  
 - -- Carl Hetherington <carl@houllier.lan>  Mon, 07 Jan 2013 23:57:26 +0000
 + -- Carl Hetherington <cth@carlh.net>  Sat, 12 Jan 2013 23:07:15 +0000
  
  dvdomatic (0.70beta3-1) UNRELEASED; urgency=low
  

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

diff --cc wscript
Simple merge