X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fbrender.C;h=131f6cf04eadc914ecca54dfaa6810faacf9d67a;hb=9db053d413fde01439cc72ec2109913dfda2ec7b;hp=94a569a7faaf8bf7bbbe6dd545ecf319ad36574c;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/brender.C b/cinelerra-5.1/cinelerra/brender.C
index 94a569a7..131f6cf0 100644
--- a/cinelerra-5.1/cinelerra/brender.C
+++ b/cinelerra-5.1/cinelerra/brender.C
@@ -49,7 +49,7 @@
 
 extern "C"
 {
-#include <uuid/uuid.h>
+#include <uuid.h>
 }
 
 
@@ -93,9 +93,9 @@ TRACE("BRender::~BRender 5\n");
 	{
 		kill(master_pid, SIGKILL);
 TRACE("BRender::~BRender 6\n");
-		Thread::join();
 TRACE("BRender::~BRender 7\n");
 	}
+	Thread::join();
 
 TRACE("BRender::~BRender 8\n");
 	delete map_lock;
@@ -569,7 +569,9 @@ void BRenderThread::start()
 		if(last_good < 0) last_good = last_contiguous;
 		int start_frame = MIN(last_contiguous, last_good);
 		start_frame = MAX(start_frame, brender_start);
-		int64_t end_frame = Units::round(command->edl->tracks->total_video_length() *
+//		int64_t end_frame = Units::round(command->edl->tracks->total_video_length() *
+//			command->edl->session->frame_rate);
+		int64_t end_frame = Units::round(command->edl->session->brender_end *
 			command->edl->session->frame_rate);
 		if(end_frame < start_frame) end_frame = start_frame;