projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_content.cc
diff --git
a/src/lib/ffmpeg_content.cc
b/src/lib/ffmpeg_content.cc
index 2b507ab371adf3187c08d5b1241ff80c7f359edc..9889d511cd45016c97b08746bce15856a953e265 100644
(file)
--- a/
src/lib/ffmpeg_content.cc
+++ b/
src/lib/ffmpeg_content.cc
@@
-36,6
+36,8
@@
extern "C" {
#include "i18n.h"
#include "i18n.h"
+#define LOG_GENERAL(...) film->log()->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL);
+
using std::string;
using std::stringstream;
using std::vector;
using std::string;
using std::stringstream;
using std::vector;
@@
-173,7
+175,7
@@
FFmpegContent::examine (shared_ptr<Job> job)
shared_ptr<const Film> film = _film.lock ();
assert (film);
shared_ptr<const Film> film = _film.lock ();
assert (film);
-
film->log()->log (String::compose ("Video length obtained from header as %1 frames", video_length.frames (video_frame_rate ()
)));
+
LOG_GENERAL ("Video length obtained from header as %1 frames", video_length.frames (video_frame_rate (
)));
{
boost::mutex::scoped_lock lm (_mutex);
{
boost::mutex::scoped_lock lm (_mutex);