diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-04-09 23:43:00 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-04-09 23:43:00 +0100 |
| commit | b66010a281acd3e3e58ef7202bce55023fc29d7f (patch) | |
| tree | e23ee83991adef3577caf8dd605f5ce06d00704c /src/lib/video_decoder.cc | |
| parent | e94cd129dcd66a76210880bfdf19d27f7992651b (diff) | |
Merge ImageMagick and FFmpeg content into VideoContent list; remove seek_to_last hacks.
Diffstat (limited to 'src/lib/video_decoder.cc')
| -rw-r--r-- | src/lib/video_decoder.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc index fd2b28d7f..99d711693 100644 --- a/src/lib/video_decoder.cc +++ b/src/lib/video_decoder.cc @@ -32,7 +32,7 @@ using boost::optional; VideoDecoder::VideoDecoder (shared_ptr<const Film> f) : Decoder (f) , _video_frame (0) - , _last_source_time (0) + , _last_content_time (0) { } @@ -88,7 +88,7 @@ VideoDecoder::signal_video (shared_ptr<Image> image, bool same, shared_ptr<Subti _last_image = image; _last_subtitle = sub; - _last_source_time = t; + _last_content_time = t; } /** Set up the current subtitle. This will be put onto frames that |