background render fix, bluebanana keyframe alpha fix

diff --git a/cinelerra-5.1/cinelerra/file.C b/cinelerra-5.1/cinelerra/file.C
index a502b9f2a8503d5083046a58c08f45824bdfa58a..8179d0d3977f68a9c4c20921bb5ed377ff1055ce 100644 (file)
--- a/cinelerra-5.1/cinelerra/file.C
+++ b/cinelerra-5.1/cinelerra/file.C
@@ -622,8 +622,8 @@ int File::open_file(Preferences *preferences,
        }
 
        if( rd ) {
-// one frame image file, no specific length
-               if( !this->asset->audio_data &&
+// one frame image file, not brender, no specific length
+               if( !this->asset->audio_data && this->asset->use_header &&
                    this->asset->video_data && !this->asset->single_frame &&
                    this->asset->video_length >= 0 && this->asset->video_length <= 1 ) {
                        this->asset->single_frame = 1;

diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C
index 6b45541b3f32530e220213818f8d9cb34fcda1ee..27aa6dfa121b3b9297108cd7a29b4a4fa4394712 100644 (file)
--- a/cinelerra-5.1/cinelerra/mwindow.C
+++ b/cinelerra-5.1/cinelerra/mwindow.C
@@ -1004,6 +1004,7 @@ void MWindow::init_edl()
        edl->create_objects();
        fill_preset_defaults(default_standard, edl->session);
        edl->load_defaults(defaults);
+       edl->session->brender_start = edl->session->brender_end = 0;
        edl->create_default_tracks();
        edl->tracks->update_y_pixels(theme);
 }

diff --git a/cinelerra-5.1/plugins/bluebanana/bluebananaconfig.C b/cinelerra-5.1/plugins/bluebanana/bluebananaconfig.C
index c0c0d0a11fcf4ad78475fddd2dd442bd6f677b58..74ecf1b468984e27576c095a56d480bae63cfcdc 100644 (file)
--- a/cinelerra-5.1/plugins/bluebanana/bluebananaconfig.C
+++ b/cinelerra-5.1/plugins/bluebanana/bluebananaconfig.C
@@ -261,6 +261,7 @@ void BluebananaConfig::interpolate(BluebananaConfig &prev,
 
   Hadj_val = ( prev.Hadj_val*prev_scale + next.Hadj_val*next_scale);
   Oadj_val = ( prev.Oadj_val*prev_scale + next.Oadj_val*next_scale);
+  Aadj_val = ( prev.Aadj_val*prev_scale + next.Aadj_val*next_scale);
 
   Sadj_gamma = ( prev.Sadj_gamma*prev_scale + next.Sadj_gamma*next_scale);
   Sadj_lo = ( prev.Sadj_lo*prev_scale + next.Sadj_lo*next_scale);