X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fpackagedispatcher.C;fp=cinelerra-5.1%2Fcinelerra%2Fpackagedispatcher.C;h=17d02c0d3bad198b0e60f228f5403689ad93f3bc;hp=dccec03a2896c3f8676a0f66b44f589b285bc090;hb=7efb497e185234700abe3abeaa430471c4e34f58;hpb=25e944875e181186eeb59a124c1822e5b55d2248;ds=sidebyside diff --git a/cinelerra-5.1/cinelerra/packagedispatcher.C b/cinelerra-5.1/cinelerra/packagedispatcher.C index dccec03a..17d02c0d 100644 --- 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;