projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix a couple more crashes with incorrect KDMs (#1000).
[dcpomatic.git]
/
src
/
lib
/
decoder.cc
diff --git
a/src/lib/decoder.cc
b/src/lib/decoder.cc
index 1281897e011a6e8199347967fcee46ed6adf0763..502273de1e49f5a551110674a5d8284572dbe180 100644
(file)
--- a/
src/lib/decoder.cc
+++ b/
src/lib/decoder.cc
@@
-34,15
+34,15
@@
Decoder::position () const
{
optional<ContentTime> pos;
{
optional<ContentTime> pos;
- if (video && (!pos || video->position() < *pos)) {
+ if (video &&
!video->ignore() &&
(!pos || video->position() < *pos)) {
pos = video->position();
}
pos = video->position();
}
- if (audio && (!pos || audio->position() < *pos)) {
+ if (audio &&
!audio->ignore() &&
(!pos || audio->position() < *pos)) {
pos = audio->position();
}
pos = audio->position();
}
- if (subtitle && (!pos || subtitle->position() < *pos)) {
+ if (subtitle &&
!subtitle->ignore() &&
(!pos || subtitle->position() < *pos)) {
pos = subtitle->position();
}
pos = subtitle->position();
}
@@
-52,6
+52,9
@@
Decoder::position () const
void
Decoder::seek (ContentTime, bool)
{
void
Decoder::seek (ContentTime, bool)
{
+ if (video) {
+ video->seek ();
+ }
if (audio) {
audio->seek ();
}
if (audio) {
audio->seek ();
}