projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rework canvas zoom, add 3 plugins from 7.2, tweak cwdw boundry, vdevicex11 dupl close...
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
vedit.C
diff --git
a/cinelerra-5.1/cinelerra/vedit.C
b/cinelerra-5.1/cinelerra/vedit.C
index c40f72d8b31efb01b2c927e308419a6672a9c5c6..eaa28c1a1d27290a684c60948185d4afdfc7e7e8 100644
(file)
--- a/
cinelerra-5.1/cinelerra/vedit.C
+++ b/
cinelerra-5.1/cinelerra/vedit.C
@@
-145,13
+145,12
@@
int64_t VEdit::get_source_end(int64_t default_)
{
if(!nested_edl && !asset) return default_; // Infinity
{
if(!nested_edl && !asset) return default_; // Infinity
- if(nested_edl)
- {
+ if( nested_edl ) {
return (int64_t)(nested_edl->tracks->total_length() *
edl->session->frame_rate + 0.5);
}
return (int64_t)(nested_edl->tracks->total_length() *
edl->session->frame_rate + 0.5);
}
- return
(int64_t)((double)asset->video_length /
- asset->frame_rate *
- edl->session->frame_rate + 0.5);
+ return
asset->video_length < 0 ? default_ :
+ (int64_t)((double)asset->video_length /
+
asset->frame_rate *
edl->session->frame_rate + 0.5);
}
}