Merge branch 'master' into cxml

5 files changed, 1 insertions, 15 deletions

diff --git a/src/picture_asset.cc b/src/picture_asset.cc
index 72a63173..b5f59f3b 100644
--- a/src/picture_asset.cc
+++ b/src/picture_asset.cc
@@ -533,8 +533,3 @@ MonoPictureAssetWriter::finalize ()
 	_asset->set_intrinsic_duration (_frames_written);
 	_asset->set_duration (_frames_written);
 }
-
-MonoPictureAssetWriter::~MonoPictureAssetWriter ()
-{
-	assert (_finalized);
-}
diff --git a/src/picture_asset.h b/src/picture_asset.h
index 3edf3a1c..8536bacc 100644
--- a/src/picture_asset.h
+++ b/src/picture_asset.h
@@ -113,8 +113,6 @@ struct FrameInfo
 class MonoPictureAssetWriter
 {
 public:
-	~MonoPictureAssetWriter ();
-
 	FrameInfo write (uint8_t* data, int size);
 	void fake_write (int size);
 	void finalize ();
diff --git a/src/sound_asset.cc b/src/sound_asset.cc
index 4a7abd4d..f59d82ad 100644
--- a/src/sound_asset.cc
+++ b/src/sound_asset.cc
@@ -400,8 +400,3 @@ SoundAssetWriter::finalize ()
 	_asset->set_intrinsic_duration (_frames_written);
 	_asset->set_duration (_frames_written);
 }
-
-SoundAssetWriter::~SoundAssetWriter ()
-{
-	assert (_finalized);
-}
diff --git a/src/sound_asset.h b/src/sound_asset.h
index 1e3553a0..7b9c65a7 100644
--- a/src/sound_asset.h
+++ b/src/sound_asset.h
@@ -37,8 +37,6 @@ class SoundAsset;
 class SoundAssetWriter
 {
 public:
-	~SoundAssetWriter ();
-
 	void write (float const * const *, int);
 	void finalize ();
 
diff --git a/wscript b/wscript
index 004be672..5b4ec52c 100644
--- a/wscript
+++ b/wscript
@@ -2,7 +2,7 @@ import subprocess
 import os
 
 APPNAME = 'libdcp'
-VERSION = '0.53pre'
+VERSION = '0.54pre'
 
 def options(opt):
     opt.load('compiler_cxx')