X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fffmpeg_content.cc;h=9f8cb78a60dce3596778facad10f15b8c1642f20;hb=b1dc9c3a2f7e55c9afc5bf2d5b465371b048e14f;hp=7416630c13799a47dd5ebeba7a90d4d9ad95c78d;hpb=406cf117093a42e9a6c994cc34719869eba77caa;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index 7416630c1..9f8cb78a6 100644
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -32,7 +32,6 @@
 #include "log.h"
 #include "exceptions.h"
 #include "frame_rate_change.h"
-#include "safe_stringstream.h"
 #include "raw_convert.h"
 #include "subtitle_content.h"
 #include <libcxml/cxml.h>
@@ -388,29 +387,27 @@ FFmpegContent::set_filters (vector<Filter const *> const & filters)
 string
 FFmpegContent::identifier () const
 {
-	SafeStringStream 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>
@@ -543,10 +540,11 @@ FFmpegContent::add_properties (list<UserProperty>& p) const
 			_("BT2020 for a 10-bit system"),
 			_("BT2020 for a 12-bit system"),
 			_("SMPTE ST 2084 for 10, 12, 14 and 16 bit systems"),
-			_("SMPTE ST 428-1")
+			_("SMPTE ST 428-1"),
+			_("ARIB STD-B67 ('Hybrid log-gamma')")
 		};
 
-		DCPOMATIC_ASSERT (AVCOL_TRC_NB <= 18);
+		DCPOMATIC_ASSERT (AVCOL_TRC_NB <= 19);
 		p.push_back (UserProperty (UserProperty::VIDEO, _("Colour transfer characteristic"), transfers[_color_trc]));
 
 		char const * spaces[] = {