X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fdevice1394output.C;h=7cda574b1119f0d6661bd3ffd274f1c4826bc20a;hb=255afe5bf50d8e2d10075c0b8ab0f88efbe91570;hp=f021a165b35585241c3a42cfd6b3768c2c4da611;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/device1394output.C b/cinelerra-5.1/cinelerra/device1394output.C
index f021a165..7cda574b 100644
--- a/cinelerra-5.1/cinelerra/device1394output.C
+++ b/cinelerra-5.1/cinelerra/device1394output.C
@@ -79,8 +79,8 @@ Device1394Output::~Device1394Output()
 		done = 1;
 		start_lock->unlock();
 		Thread::cancel();
-		Thread::join();
 	}
+	Thread::join();
 
 	if(buffer)
 	{
@@ -644,13 +644,7 @@ void Device1394Output::write_frame(VFrame *input)
 				int h = input->get_h();
 // Default to NTSC if unknown
 				if(h != 480 && h != 576) h = 480;
-
-				temp_frame2 = new VFrame(0,
-					-1,
-					720,
-					h,
-					BC_YUV422,
-					-1);
+				temp_frame2 = new VFrame(720, h, BC_YUV422, 0);
 
 			}