From b1dc9c3a2f7e55c9afc5bf2d5b465371b048e14f Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Wed, 10 Aug 2016 16:38:33 +0100
Subject: Remove all use of stringstream in an attempt to fix the suspected
 thread-unsafe crash bugs on OS X.

---
 src/lib/ffmpeg_content.cc | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

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

diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index 60c777b3c..9f8cb78a6 100644
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -34,7 +34,6 @@
 #include "frame_rate_change.h"
 #include "raw_convert.h"
 #include "subtitle_content.h"
-#include <locked_sstream.h>
 #include <libcxml/cxml.h>
 extern "C" {
 #include <libavformat/avformat.h>
@@ -388,29 +387,27 @@ FFmpegContent::set_filters (vector<Filter const *> const & filters)
 string
 FFmpegContent::identifier () const
 {
-	locked_stringstream s;
-
-	s << Content::identifier();
+	string s = Content::identifier();
 
 	if (video) {
-		s << "_" << video->identifier();
+		s += "_" + video->identifier();
 	}
 
 	if (subtitle) {
-		s << "_" << subtitle->identifier();
+		s += "_" + subtitle->identifier();
 	}
 
 	boost::mutex::scoped_lock lm (_mutex);
 
 	if (_subtitle_stream) {
-		s << "_" << _subtitle_stream->identifier ();
+		s += "_" + _subtitle_stream->identifier ();
 	}
 
 	for (vector<Filter const *>::const_iterator i = _filters.begin(); i != _filters.end(); ++i) {
-		s << "_" << (*i)->id ();
+		s += "_" + (*i)->id ();
 	}
 
-	return s.str ();
+	return s;
 }
 
 list<ContentTimePeriod>
-- 
cgit v1.2.3