diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-11-14 11:49:13 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-11-14 11:49:13 +0000 |
| commit | d99ca0a95e61b53105f765497bc465a7420e7a47 (patch) | |
| tree | 58a67cdd855671dab9ffbd287ecb99ff248e4c1b /src/lib/encoder.cc | |
| parent | e01bcff13a26ebd5158212d8fde57985afe2788e (diff) | |
| parent | f60d6f84708e2ff568089732cb9fbdbdc8cef3db (diff) | |
Merge branch '1.0' into 1.0-multiple-selection
Diffstat (limited to 'src/lib/encoder.cc')
| -rw-r--r-- | src/lib/encoder.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc index ecbf2e5bf..059c4014c 100644 --- a/src/lib/encoder.cc +++ b/src/lib/encoder.cc @@ -277,7 +277,7 @@ Encoder::encoder_thread (optional<ServerDescription> server) TIMING ("encoder thread %1 wakes with queue of %2", boost::this_thread::get_id(), _queue.size()); shared_ptr<DCPVideoFrame> vf = _queue.front (); - _film->log()->log (String::compose (N_("Encoder thread %1 pops frame %2 (%3) from queue"), boost::this_thread::get_id(), vf->frame(), vf->eyes ())); + TIMING ("encoder thread %1 pops frame %2 (%3) from queue", boost::this_thread::get_id(), vf->frame(), vf->eyes ()); _queue.pop_front (); lock.unlock (); |