auto interpolate_from orig_id fix, move brender set_video_map update to write_frame_done

[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / packagedispatcher.C

diff --git a/cinelerra-5.1/cinelerra/packagedispatcher.C b/cinelerra-5.1/cinelerra/packagedispatcher.C
index dccec03a2896c3f8676a0f66b44f589b285bc090..17d02c0d3bad198b0e60f228f5403689ad93f3bc 100644 (file)
--- a/cinelerra-5.1/cinelerra/packagedispatcher.C
+++ b/cinelerra-5.1/cinelerra/packagedispatcher.C
@@ -279,9 +279,11 @@ RenderPackage* PackageDispatcher::get_package(double frames_per_second,
                        result->video_start = video_position;
                        result->audio_end = result->audio_start +
                                Units::to_int64(scaled_len * default_asset->sample_rate);
+                       if( result->audio_end > audio_end ) result->audio_end = audio_end;
                        result->video_end = result->video_start +
                                Units::to_int64(scaled_len * default_asset->frame_rate);
-                       if(result->video_end == result->video_start) result->video_end++;
+                       if( result->video_end > video_end ) result->video_end = video_end;
+                       if( result->video_end == result->video_start ) result->video_end++;
                        audio_position = result->audio_end;
                        video_position = result->video_end;
                        result->audio_do = default_asset->audio_data;