X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_examiner.cc;h=48d85da6f11113cb6cabc83215505c8df766110a;hb=8c7a308c03e4b4196b4e2379a26d432b100ae2b1;hp=949062f5bd5c3a9e5b1eace869ffc4474007560f;hpb=05654d0e1799746a9df3ccab040c92e0ed825cac;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_examiner.cc b/src/lib/ffmpeg_examiner.cc
index 949062f5b..48d85da6f 100644
--- a/src/lib/ffmpeg_examiner.cc
+++ b/src/lib/ffmpeg_examiner.cc
@@ -26,13 +26,13 @@ extern "C" {
 #include "ffmpeg_audio_stream.h"
 #include "ffmpeg_subtitle_stream.h"
 #include "util.h"
+#include "safe_stringstream.h"
 
 #include "i18n.h"
 
 using std::string;
 using std::cout;
 using std::max;
-using std::stringstream;
 using boost::shared_ptr;
 using boost::optional;
 
@@ -176,14 +176,14 @@ FFmpegExaminer::video_size () const
 ContentTime
 FFmpegExaminer::video_length () const
 {
-	ContentTime const length = ContentTime::from_seconds (double (_format_context->duration - _format_context->start_time) / AV_TIME_BASE);
-	return ContentTime (max (int64_t (1), length.get ()));
+	ContentTime const length = ContentTime::from_seconds (double (_format_context->duration) / AV_TIME_BASE);
+	return ContentTime (max (ContentTime::Type (1), length.get ()));
 }
 
 string
 FFmpegExaminer::audio_stream_name (AVStream* s) const
 {
-	stringstream n;
+	SafeStringStream n;
 
 	n << stream_name (s);
 
@@ -199,7 +199,7 @@ FFmpegExaminer::audio_stream_name (AVStream* s) const
 string
 FFmpegExaminer::subtitle_stream_name (AVStream* s) const
 {
-	stringstream n;
+	SafeStringStream n;
 
 	n << stream_name (s);
 
@@ -213,7 +213,7 @@ FFmpegExaminer::subtitle_stream_name (AVStream* s) const
 string
 FFmpegExaminer::stream_name (AVStream* s) const
 {
-	stringstream n;
+	SafeStringStream n;
 
 	if (s->metadata) {
 		AVDictionaryEntry const * lang = av_dict_get (s->metadata, "language", 0, 0);