X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fformattools.C;h=d6f275993e225a44b32a7353b4cf26a8ff96678d;hb=c6d96a41db6be59cc4b7fba8f40f57873f6713db;hp=ad6df95b18b19379cc0b5a128bd0dc656ed7d4b5;hpb=6616b3b82fdbc586f5da00bf772e45d8ada3b464;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/formattools.C b/cinelerra-5.1/cinelerra/formattools.C
index ad6df95b..d6f27599 100644
--- a/cinelerra-5.1/cinelerra/formattools.C
+++ b/cinelerra-5.1/cinelerra/formattools.C
@@ -204,17 +204,17 @@ void FormatTools::create_objects(int &init_x,
 	x = init_x;
 	window->add_subwindow(format_title = new BC_Title(x, y, _("File Format:")));
 	x += 90;
-	window->add_subwindow(format_text = new BC_TextBox(x, y, 180, 1,
+	window->add_subwindow(format_text = new BC_TextBox(x, y, 160, 1,
 		File::formattostr(asset->format)));
 	x += format_text->get_w();
 //printf("FormatTools::create_objects %d %p\n", __LINE__, window);
 	window->add_subwindow(format_button = new FormatFormat(x, y, this));
 	format_button->create_objects();
 	x += format_button->get_w() + 5;
-	window->add_subwindow(ffmpeg_type = new FFMpegType(x, y+5, 50, 1, asset->fformat));
+	window->add_subwindow(ffmpeg_type = new FFMpegType(x, y, 64, 1, asset->fformat));
 	FFMPEG::set_asset_format(asset, asset->fformat);
 	x += ffmpeg_type->get_w();
-	window->add_subwindow(format_ffmpeg = new FormatFFMPEG(x, y+5, this));
+	window->add_subwindow(format_ffmpeg = new FormatFFMPEG(x, y, this));
 	format_ffmpeg->create_objects();
 	x = init_x;
 	y += format_button->get_h() + 10;
@@ -319,8 +319,6 @@ void FormatTools::update_driver(int driver)
 
 		case CAPTURE_IEC61883:
 		case CAPTURE_FIREWIRE:
-		case CAPTURE_LML:
-		case CAPTURE_BUZ:
 		case VIDEO4LINUX2JPEG:
 		case CAPTURE_JPEG_WEBCAM:
 			asset->format = FILE_FFMPEG;
@@ -332,8 +330,6 @@ void FormatTools::update_driver(int driver)
 				locked_compressor = (char*)CODEC_TAG_DVSD;
 				break;
 
-			case CAPTURE_BUZ:
-			case CAPTURE_LML:
 			case VIDEO4LINUX2JPEG:
 				locked_compressor = (char*)CODEC_TAG_MJPEG;
 				break;
@@ -690,9 +686,8 @@ FormatAThread::FormatAThread(FormatTools *format)
 
 FormatAThread::~FormatAThread()
 {
+	delete file;  file = 0;
 	join();
-	delete file;
-	file = 0;
 }
 
 void FormatAThread::start()
@@ -721,9 +716,8 @@ FormatVThread::FormatVThread(FormatTools *format)
 
 FormatVThread::~FormatVThread()
 {
+	delete file;  file = 0;
 	join();
-	delete file;
-	file = 0;
 }
 
 void FormatVThread::start()