png img proxy fixes, speed zoom segv fix, colapse ins 1frm silence undo, repair rende...

[goodguy/history.git] / cinelerra-5.1 / cinelerra / proxy.C

diff --git a/cinelerra-5.1/cinelerra/proxy.C b/cinelerra-5.1/cinelerra/proxy.C
index fc1380edfc9b32391fcef17707543b427322daea..b534a10e174e0fe5b72a2b29ac8d21ef579b4d6f 100644 (file)
--- a/cinelerra-5.1/cinelerra/proxy.C
+++ b/cinelerra-5.1/cinelerra/proxy.C
@@ -260,15 +260,13 @@ Asset *ProxyRender::add_original(Indexable *idxbl, int new_scale)
        if( !proxy ) {
                proxy = new Asset(new_path);
 // new compression parameters
-               int64_t video_length = idxbl->get_video_frames();
-               if( video_length < 0 ) {
+               if( idxbl->get_video_frames() < 0 ) {
                        proxy->format = FILE_PNG;
                        proxy->png_use_alpha = 1;
-                       proxy->video_length = 1;
+                       proxy->video_length = -1;
                }
                else {
                        proxy->copy_format(format_asset, 0);
-                       proxy->video_length = video_length;
                }
                proxy->awindow_folder = AW_PROXY_FOLDER;
                proxy->audio_data = 0;
@@ -472,6 +470,7 @@ void ProxyUseScaler::update()
 
 int ProxyUseScaler::handle_event()
 {
+       pwindow->dialog->new_scale = 1;
        pwindow->dialog->use_scaler = get_value();
        pwindow->scale_factor->update_sizes();
        pwindow->update();