rework proxy scaler, fix crop-gui coord, video_data tweak for proxy_format

[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 f4f26dac22e9479c53b74881780180ad3d3c3dc9..591cb8114a3454a24b87db6745f6af3f9203abeb 100644 (file)
--- a/cinelerra-5.1/cinelerra/filelist.C
+++ b/cinelerra-5.1/cinelerra/filelist.C
@@ -131,12 +131,12 @@ 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;
+                                       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->frame_rate = 10;