summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--debian/changelog12
-rw-r--r--src/lib/encoder.h1
-rw-r--r--wscript2
4 files changed, 22 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e7a006cb4..8787a9b2d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2012-12-20 Carl Hetherington <cth@carlh.net>
+ * Version 0.68beta4 released.
+
+2012-12-20 Carl Hetherington <cth@carlh.net>
+
+ * Version 0.68beta3 released.
+
+2012-12-20 Carl Hetherington <cth@carlh.net>
+
* Allow still-image DCPs to have external audio added to them (#13).
2012-12-19 Carl Hetherington <cth@carlh.net>
diff --git a/debian/changelog b/debian/changelog
index d03978d7d..30b152110 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+dvdomatic (0.68beta4-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Carl Hetherington <carl@houllier.lan> Thu, 20 Dec 2012 07:48:45 +0000
+
+dvdomatic (0.68beta3-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Carl Hetherington <carl@houllier.lan> Thu, 20 Dec 2012 00:35:45 +0000
+
dvdomatic (0.68beta2-1) unstable; urgency=low
* New upstream release.
diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 8ab4479ef..e5916ad3a 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -28,6 +28,7 @@
#include <boost/thread/mutex.hpp>
#include <boost/thread/condition.hpp>
#include <boost/thread.hpp>
+#include <boost/optional.hpp>
#include <list>
#include <stdint.h>
extern "C" {
diff --git a/wscript b/wscript
index 6ba196cce..5b31c5890 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
import sys
APPNAME = 'dvdomatic'
-VERSION = '0.68beta2'
+VERSION = '0.68beta4'
def options(opt):
opt.load('compiler_cxx')