Rename SafeStringStream -> locked_stringstream. Bump deps for removal of stringstream.

[dcpomatic.git] / src / lib / ffmpeg_content.cc

diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index 7416630c13799a47dd5ebeba7a90d4d9ad95c78d..60c777b3c3d9f6107386525fa211630c14906afc 100644 (file)
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -32,9 +32,9 @@
 #include "log.h"
 #include "exceptions.h"
 #include "frame_rate_change.h"
-#include "safe_stringstream.h"
 #include "raw_convert.h"
 #include "subtitle_content.h"
+#include <locked_sstream.h>
 #include <libcxml/cxml.h>
 extern "C" {
 #include <libavformat/avformat.h>
@@ -388,7 +388,7 @@ FFmpegContent::set_filters (vector<Filter const *> const & filters)
 string
 FFmpegContent::identifier () const
 {
-       SafeStringStream s;
+       locked_stringstream s;
 
        s << Content::identifier();
 
@@ -543,10 +543,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[] = {