projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
f832ef7
)
Only use last real frame if it exists.
author
Carl Hetherington
<cth@carlh.net>
Thu, 20 Dec 2012 07:52:16 +0000
(07:52 +0000)
committer
Carl Hetherington
<cth@carlh.net>
Thu, 20 Dec 2012 07:52:16 +0000
(07:52 +0000)
src/lib/encoder.cc
patch
|
blob
|
history
diff --git
a/src/lib/encoder.cc
b/src/lib/encoder.cc
index 16bf624084527c0cfdb8470f9f6109778db9a768..07ce8f3bc20c2aa35b43a7f9646da5db0b123ac6 100644
(file)
--- a/
src/lib/encoder.cc
+++ b/
src/lib/encoder.cc
@@
-304,9
+304,8
@@
Encoder::process_video (shared_ptr<Image> image, bool same, boost::shared_ptr<Su
return;
}
- if (same) {
+ if (same
&& _last_real_frame
) {
/* Use the last frame that we encoded */
- assert (_last_real_frame);
link (_opt->frame_out_path (_last_real_frame.get(), false), _opt->frame_out_path (_video_frame, false));
link (_opt->hash_out_path (_last_real_frame.get(), false), _opt->hash_out_path (_video_frame, false));
} else {