projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix undo segv with plugin guis open, add cache demand limits, exit when malloc fails...
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
filelist.C
diff --git
a/cinelerra-5.1/cinelerra/filelist.C
b/cinelerra-5.1/cinelerra/filelist.C
index ee287bc4ec2485af1d2f443e02970072a574d92a..591cb8114a3454a24b87db6745f6af3f9203abeb 100644
(file)
--- a/
cinelerra-5.1/cinelerra/filelist.C
+++ b/
cinelerra-5.1/cinelerra/filelist.C
@@
-131,15
+131,15
@@
int FileList::open_file(int rd, int wr)
else
result = 1;
if( !result ) {
else
result = 1;
if( !result ) {
- int width = asset->width;
- int height = asset->height;
asset->actual_width = asset->width;
asset->actual_width = asset->width;
- if( width ) asset->width = width;
asset->actual_height = asset->height;
asset->actual_height = asset->height;
- if( height ) asset->height = height;
+ int scale = asset->proxy_scale;
+ if( !scale ) scale = 1;
+ asset->width = asset->actual_width * scale;
+ asset->height = asset->actual_height * scale;
asset->layers = 1;
if( !asset->frame_rate )
asset->layers = 1;
if( !asset->frame_rate )
- asset->frame_rate = 1;
+ asset->frame_rate = 1
0
;
}
}
else
}
}
else