projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9418f54
)
Add comment note.
author
Carl Hetherington
<cth@carlh.net>
Mon, 15 Jul 2013 15:35:03 +0000
(16:35 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Mon, 15 Jul 2013 15:35:03 +0000
(16:35 +0100)
src/lib/ffmpeg_decoder.cc
patch
|
blob
|
history
diff --git
a/src/lib/ffmpeg_decoder.cc
b/src/lib/ffmpeg_decoder.cc
index 18834c90e1b5249251bf6ba9e14bba1a8a8885f0..11cea8fb140dbcde881c23740a76bb2c3a41a72a 100644
(file)
--- a/
src/lib/ffmpeg_decoder.cc
+++ b/
src/lib/ffmpeg_decoder.cc
@@
-338,7
+338,7
@@
FFmpegDecoder::seek (VideoContent::Frame frame, bool accurate)
_video_position = rint (
(av_frame_get_best_effort_timestamp (_frame) * time_base + _video_pts_offset) * _ffmpeg_content->video_frame_rate()
);
_video_position = rint (
(av_frame_get_best_effort_timestamp (_frame) * time_base + _video_pts_offset) * _ffmpeg_content->video_frame_rate()
);
-
+
if (_video_position >= (frame - 1)) {
av_free_packet (&_packet);
break;
if (_video_position >= (frame - 1)) {
av_free_packet (&_packet);
break;
@@
-451,6
+451,8
@@
FFmpegDecoder::decode_video_packet ()
/* This PTS is more than one frame forward in time of where we think we should be; emit
a black frame.
*/
/* This PTS is more than one frame forward in time of where we think we should be; emit
a black frame.
*/
+
+ /* XXX: I think this should be a copy of the last frame... */
boost::shared_ptr<Image> black (
new Image (
static_cast<AVPixelFormat> (_frame->format),
boost::shared_ptr<Image> black (
new Image (
static_cast<AVPixelFormat> (_frame->format),