Merge in 0.70 branch with 0.71 fix.

4 files changed, 17 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 36bda83b4..56a380402 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+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
diff --git a/debian/changelog b/debian/changelog
index b8385a4b0..b051ced3a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,10 @@
-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.
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index efedfcfef..910d7c58e 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -350,6 +350,7 @@ Encoder::process_audio (shared_ptr<AudioBuffers> data)
 
 		if (this_range.second < required_range.first || required_range.second < this_range.first) {
 			/* No part of this audio is within the required range */
+			_audio_frame += data->frames();
 			return;
 		} else if (required_range.first >= this_range.first && required_range.first < this_range.second) {
 			/* Trim start */
diff --git a/wscript b/wscript
index d8ec37667..ef962e90f 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dvdomatic'
-VERSION = '0.71beta2'
+VERSION = '0.72pre'
 
 def options(opt):
     opt.load('compiler_cxx')