summaryrefslogtreecommitdiff
path: root/src/lib/player.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-10-20 09:55:24 +0100
committerCarl Hetherington <cth@carlh.net>2015-10-22 10:30:45 +0100
commit2c5398adaea8bc56fe196144a9a233981657fba0 (patch)
treef243d30eaef1f30045f0974b0f99fce3ed1d483b /src/lib/player.h
parent3a626081718fe09edafb951ac9a69e44145bf551 (diff)
Various multi-reel fixes.
* _video_frames_enqueued -> _position * some int -> Frame replacements * Call Writer::ref_write when there is nothing to encode / write for one frame. * Assume Encoder::encode is called once per output video frame. * Possibly correct some off-by-1 overlap bugs. * Don't reset _last_written on FAKE write as I believe there is no need.
Diffstat (limited to 'src/lib/player.h')
-rw-r--r--src/lib/player.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/player.h b/src/lib/player.h
index cd1423e9f..3106a3477 100644
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -106,7 +106,7 @@ private:
continue;
}
- if ((*i)->content->position() <= to && (*i)->content->end() >= from) {
+ if ((*i)->content->position() < to && (*i)->content->end() > from) {
overlaps.push_back (*i);
}
}