projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename SafeStringStream -> locked_stringstream. Bump deps for removal of stringstream.
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_examiner.cc
diff --git
a/src/lib/ffmpeg_examiner.cc
b/src/lib/ffmpeg_examiner.cc
index 2e48810b1ed87779a9bd6e5f53d1df5931cc4a89..544cc11b91fc545d2d74426b5ab372db4933fdd1 100644
(file)
--- a/
src/lib/ffmpeg_examiner.cc
+++ b/
src/lib/ffmpeg_examiner.cc
@@
-30,9
+30,8
@@
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
<locked_sstream.h>
#include <boost/foreach.hpp>
#include <boost/foreach.hpp>
-#include <boost/make_shared.hpp>
#include <iostream>
#include "i18n.h"
#include <iostream>
#include "i18n.h"
@@
-41,7
+40,6
@@
using std::string;
using std::cout;
using std::max;
using boost::shared_ptr;
using std::cout;
using std::max;
using boost::shared_ptr;
-using boost::make_shared;
using boost::optional;
/** @param job job that the examiner is operating in, or 0 */
using boost::optional;
/** @param job job that the examiner is operating in, or 0 */
@@
-82,7
+80,7
@@
FFmpegExaminer::FFmpegExaminer (shared_ptr<const FFmpegContent> c, shared_ptr<Jo
);
} else if (s->codec->codec_type == AVMEDIA_TYPE_SUBTITLE) {
);
} else if (s->codec->codec_type == AVMEDIA_TYPE_SUBTITLE) {
- _subtitle_streams.push_back (
boost::make_shared<FFmpegSubtitleStream> (subtitle_stream_name (s), s->id
));
+ _subtitle_streams.push_back (
shared_ptr<FFmpegSubtitleStream> (new FFmpegSubtitleStream (subtitle_stream_name (s), s->id)
));
}
}
}
}
@@
-353,7
+351,7
@@
FFmpegExaminer::sample_aspect_ratio () const
string
FFmpegExaminer::subtitle_stream_name (AVStream* s) const
{
string
FFmpegExaminer::subtitle_stream_name (AVStream* s) const
{
-
SafeStringS
tream n;
+
locked_strings
tream n;
n << stream_name (s);
n << stream_name (s);
@@
-367,7
+365,7
@@
FFmpegExaminer::subtitle_stream_name (AVStream* s) const
string
FFmpegExaminer::stream_name (AVStream* s) const
{
string
FFmpegExaminer::stream_name (AVStream* s) const
{
-
SafeStringS
tream n;
+
locked_strings
tream n;
if (s->metadata) {
AVDictionaryEntry const * lang = av_dict_get (s->metadata, "language", 0, 0);
if (s->metadata) {
AVDictionaryEntry const * lang = av_dict_get (s->metadata, "language", 0, 0);