Merge branch 'staging' of /home/carl/git/dvdomatic into staging

4 files changed, 12 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index f84e5a72f..c428ad462 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-04-18  Carl Hetherington  <cth@carlh.net>
+
+	* Version 0.84beta1 released.
+
 2013-04-15  Carl Hetherington  <cth@carlh.net>
 
 	* Fix error message on forcing language to English (#103).
diff --git a/debian/changelog b/debian/changelog
index d1cea437d..eff7975f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dvdomatic (0.84beta1-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Carl Hetherington <carl@houllier.lan>  Thu, 18 Apr 2013 23:32:17 +0100
+
 dvdomatic (0.83-1) UNRELEASED; urgency=low
 
   * New upstream release.
diff --git a/src/lib/combiner.cc b/src/lib/combiner.cc
index 006dd2697..0a9eaf6b6 100644
--- a/src/lib/combiner.cc
+++ b/src/lib/combiner.cc
@@ -33,7 +33,7 @@ Combiner::Combiner (shared_ptr<Log> log)
  *  @param image Frame image.
  */
 void
-Combiner::process_video (shared_ptr<Image> image, bool, shared_ptr<Subtitle>, double t)
+Combiner::process_video (shared_ptr<Image> image, bool, shared_ptr<Subtitle>, double)
 {
 	_image = image;
 }
diff --git a/wscript b/wscript
index 5b0babd90..3ff10f4ab 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dvdomatic'
-VERSION = '0.84pre'
+VERSION = '0.84beta1'
 
 def options(opt):
     opt.load('compiler_cxx')