From 4dbc6ef917aeceb906b1ef1caf6911033e7e2c54 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Sat, 20 Dec 2014 23:37:57 +0000
Subject: Hand-apply d849d411cff28ef5453085791d0b4d7cd73bd070 from master;
 replace all assert()s with thrown exceptions.

---
 src/lib/ffmpeg_stream.cc | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/lib/ffmpeg_stream.cc')

diff --git a/src/lib/ffmpeg_stream.cc b/src/lib/ffmpeg_stream.cc
index 3fac33327..ad99defee 100644
--- a/src/lib/ffmpeg_stream.cc
+++ b/src/lib/ffmpeg_stream.cc
@@ -17,12 +17,13 @@
 
 */
 
+#include "ffmpeg_stream.h"
+#include "dcpomatic_assert.h"
+#include <dcp/raw_convert.h>
+#include <libxml++/libxml++.h>
 extern "C" {
 #include <libavformat/avformat.h>
 }
-#include <libxml++/libxml++.h>
-#include <dcp/raw_convert.h>
-#include "ffmpeg_stream.h"
 
 using std::string;
 using dcp::raw_convert;
@@ -66,6 +67,6 @@ FFmpegStream::stream (AVFormatContext const * fc) const
 		++i;
 	}
 
-	assert (false);
+	DCPOMATIC_ASSERT (false);
 	return 0;
 }
-- 
cgit v1.2.3