diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-08-23 22:50:40 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-08-23 22:50:40 +0100 |
| commit | 8c7a308c03e4b4196b4e2379a26d432b100ae2b1 (patch) | |
| tree | 605c8b62f56c5f9be2ff77161eb18ac372083a35 /src/lib/transcode_job.cc | |
| parent | 04acfa42cdffd5938358847ebee822399ef978e6 (diff) | |
| parent | a6d6a794b28c3b3e6679f01c1890f396453eb5ac (diff) | |
Merge master.
Diffstat (limited to 'src/lib/transcode_job.cc')
| -rw-r--r-- | src/lib/transcode_job.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc index 1a162b654..23a46d06d 100644 --- a/src/lib/transcode_job.cc +++ b/src/lib/transcode_job.cc @@ -27,6 +27,7 @@ #include "film.h" #include "transcoder.h" #include "log.h" +#include "safe_stringstream.h" #include "i18n.h" @@ -34,7 +35,6 @@ #define LOG_ERROR_NC(...) _film->log()->log (__VA_ARGS__, Log::TYPE_ERROR); using std::string; -using std::stringstream; using std::fixed; using std::setprecision; using std::cout; @@ -90,7 +90,7 @@ TranscodeJob::status () const return Job::status (); } - stringstream s; + SafeStringStream s; s << Job::status (); |