projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6ca34bc
)
Stop crashing when running the hints check on films with silent/black gaps.
author
Carl Hetherington
<cth@carlh.net>
Mon, 9 Sep 2019 00:18:54 +0000
(
01:18
+0100)
committer
Carl Hetherington
<cth@carlh.net>
Mon, 9 Sep 2019 00:18:54 +0000
(
01:18
+0100)
src/lib/player.cc
patch
|
blob
|
history
diff --git
a/src/lib/player.cc
b/src/lib/player.cc
index 23fe65cf4c8fcfd9448975d1b050edc7f787c8cb..fd9ffb9ed4f65cb23e27affa79001e9fd7317609 100644
(file)
--- a/
src/lib/player.cc
+++ b/
src/lib/player.cc
@@
-614,12
+614,12
@@
Player::pass ()
which = CONTENT;
}
which = CONTENT;
}
- if (!_black.done() && (!earliest_time || _black.position() < *earliest_time)) {
+ if (!_black.done() &&
!_ignore_video &&
(!earliest_time || _black.position() < *earliest_time)) {
earliest_time = _black.position ();
which = BLACK;
}
earliest_time = _black.position ();
which = BLACK;
}
- if (!_silent.done() && (!earliest_time || _silent.position() < *earliest_time)) {
+ if (!_silent.done() &&
!_ignore_audio &&
(!earliest_time || _silent.position() < *earliest_time)) {
earliest_time = _silent.position ();
which = SILENT;
}
earliest_time = _silent.position ();
which = SILENT;
}