projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change how video timing is done.
[dcpomatic.git]
/
src
/
lib
/
dcp_decoder.cc
diff --git
a/src/lib/dcp_decoder.cc
b/src/lib/dcp_decoder.cc
index 9064627ba9cd937a4930631e17f4665837553ee6..3ccb6ccc671ff3ad2335cc31b14f739a375f89bc 100644
(file)
--- a/
src/lib/dcp_decoder.cc
+++ b/
src/lib/dcp_decoder.cc
@@
-177,7
+177,7
@@
DCPDecoder::pass ()
AV_PIX_FMT_XYZ12LE,
_forced_reduction
),
AV_PIX_FMT_XYZ12LE,
_forced_reduction
),
- _offset + frame
+ ContentTime::from_frames(_offset + frame, vfr)
);
} else {
video->emit (
);
} else {
video->emit (
@@
-189,7
+189,7
@@
DCPDecoder::pass ()
AV_PIX_FMT_XYZ12LE,
_forced_reduction
),
AV_PIX_FMT_XYZ12LE,
_forced_reduction
),
- _offset + frame
+ ContentTime::from_frames(_offset + frame, vfr)
);
video->emit (
);
video->emit (
@@
-201,7
+201,7
@@
DCPDecoder::pass ()
AV_PIX_FMT_XYZ12LE,
_forced_reduction
),
AV_PIX_FMT_XYZ12LE,
_forced_reduction
),
- _offset + frame
+ ContentTime::from_frames(_offset + frame, vfr)
);
}
}
);
}
}