diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-03-03 12:54:07 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-03-03 12:54:07 +0000 |
| commit | 1629bd7df2150156109afbc7a16677cb29e82adf (patch) | |
| tree | f8d42b82976bf999eafd1abd499027a5ea5be02e /src/lib/encoder.cc | |
| parent | cc3900735839ff4b0da0c046b5c606c440ba917a (diff) | |
| parent | f0738a22fc7555c306d49bcd1c356ce210e2c0e2 (diff) | |
Merge master.
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 f1c3e7e61..7863859de 100644 --- a/src/lib/encoder.cc +++ b/src/lib/encoder.cc @@ -180,7 +180,7 @@ Encoder::frame_done () void Encoder::process_video (shared_ptr<PlayerImage> image, Eyes eyes, ColourConversion conversion, bool same) { - kick (); + _waker.nudge (); boost::mutex::scoped_lock lock (_mutex); |