X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ffilelist.C;h=4819cb5a438bce0a6cc6f1f3076f7a55dd5ae0d0;hb=85a4302e7031b0285aeb9559aa6dbc531db6e443;hp=ee287bc4ec2485af1d2f443e02970072a574d92a;hpb=9afc3844e37c6db23435d5d0c33129dcc81061e4;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/cinelerra/filelist.C b/cinelerra-5.1/cinelerra/filelist.C index ee287bc4..4819cb5a 100644 --- a/cinelerra-5.1/cinelerra/filelist.C +++ b/cinelerra-5.1/cinelerra/filelist.C @@ -112,6 +112,7 @@ int FileList::open_file(int rd, int wr) //printf("FileList::open_file %d asset->path=%s\n", __LINE__, asset->path); if(stream) { + int width = asset->width, height = asset->height; char string[BCTEXTLEN]; int len = strlen(list_prefix); int ret = fread(string, 1, strlen(list_prefix), stream); @@ -131,15 +132,20 @@ int FileList::open_file(int rd, int wr) else result = 1; if( !result ) { - int width = asset->width; - int height = asset->height; - asset->actual_width = asset->width; - if( width ) asset->width = width; - asset->actual_height = asset->height; - if( height ) asset->height = height; + asset->actual_width = asset->width; + asset->actual_height = asset->height; + int scale = asset->proxy_scale; + if( scale ) { + asset->width = asset->actual_width * scale; + asset->height = asset->actual_height * scale; + } + else { // can_scale_input + if( width ) asset->width = width; + if( height ) asset->height = height; + } asset->layers = 1; if( !asset->frame_rate ) - asset->frame_rate = 1; + asset->frame_rate = 10; } } else