projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove all use of stringstream in an attempt to fix
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_examiner.cc
diff --git
a/src/lib/ffmpeg_examiner.cc
b/src/lib/ffmpeg_examiner.cc
index 18a87f40e591ab0e27d66b88d2677ea75043bae4..847c141da4a142e49b694429eea41829b095224f 100644
(file)
--- a/
src/lib/ffmpeg_examiner.cc
+++ b/
src/lib/ffmpeg_examiner.cc
@@
-30,7
+30,6
@@
extern "C" {
#include "ffmpeg_audio_stream.h"
#include "ffmpeg_subtitle_stream.h"
#include "util.h"
#include "ffmpeg_audio_stream.h"
#include "ffmpeg_subtitle_stream.h"
#include "util.h"
-#include "safe_stringstream.h"
#include <boost/foreach.hpp>
#include <iostream>
#include <boost/foreach.hpp>
#include <iostream>
@@
-351,38
+350,36
@@
FFmpegExaminer::sample_aspect_ratio () const
string
FFmpegExaminer::subtitle_stream_name (AVStream* s) const
{
string
FFmpegExaminer::subtitle_stream_name (AVStream* s) const
{
-
SafeStringStream n
;
+
string n = stream_name (s)
;
- n << stream_name (s);
-
- if (n.str().empty()) {
- n << _("unknown");
+ if (n.empty()) {
+ n = _("unknown");
}
}
- return n
.str ()
;
+ return n;
}
string
FFmpegExaminer::stream_name (AVStream* s) const
{
}
string
FFmpegExaminer::stream_name (AVStream* s) const
{
-
SafeStringStream
n;
+
string
n;
if (s->metadata) {
AVDictionaryEntry const * lang = av_dict_get (s->metadata, "language", 0, 0);
if (lang) {
if (s->metadata) {
AVDictionaryEntry const * lang = av_dict_get (s->metadata, "language", 0, 0);
if (lang) {
- n
<<
lang->value;
+ n
=
lang->value;
}
AVDictionaryEntry const * title = av_dict_get (s->metadata, "title", 0, 0);
if (title) {
}
AVDictionaryEntry const * title = av_dict_get (s->metadata, "title", 0, 0);
if (title) {
- if (!n.
str().
empty()) {
- n
<<
" ";
+ if (!n.empty()) {
+ n
+=
" ";
}
}
- n
<<
title->value;
+ n
+=
title->value;
}
}
}
}
- return n
.str ()
;
+ return n;
}
int
}
int