projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a missing noncopyable.
[dcpomatic.git]
/
src
/
lib
/
decoder.cc
diff --git
a/src/lib/decoder.cc
b/src/lib/decoder.cc
index 3cadcca47198c1c79c801585b425e04971146bca..0f2bc4358008e62123e8e042a8247c142e317c71 100644
(file)
--- a/
src/lib/decoder.cc
+++ b/
src/lib/decoder.cc
@@
-44,11
+44,11
@@
Decoder::position () const
optional<ContentTime> pos;
shared_ptr<const Film> f = film();
optional<ContentTime> pos;
shared_ptr<const Film> f = film();
- if (video && !video->ignore() && (!pos || video->position(f) < *pos)) {
+ if (video && !video->ignore() && (!pos || video->position(f)
.get_value_or(ContentTime())
< *pos)) {
pos = video->position(f);
}
pos = video->position(f);
}
- if (audio && !audio->ignore() && (!pos || audio->position(f) < *pos)) {
+ if (audio && !audio->ignore() && (!pos || audio->position(f)
.get_value_or(ContentTime())
< *pos)) {
pos = audio->position(f);
}
pos = audio->position(f);
}