X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fformattools.C;h=643655e3bcac6aabd41095a9df95fd8baac10fa9;hp=2bf178ab8927d3b670e61defb7a502df38dade41;hb=1529091cdf16df199a901aabe6e8fa1813a933af;hpb=cbe947d378de6eaa11f38ec58b4f71c5c47f72bc

diff --git a/cinelerra-5.1/cinelerra/formattools.C b/cinelerra-5.1/cinelerra/formattools.C
index 2bf178ab..643655e3 100644
--- a/cinelerra-5.1/cinelerra/formattools.C
+++ b/cinelerra-5.1/cinelerra/formattools.C
@@ -388,7 +388,8 @@ void FormatTools::update_extension()
 			char *ptr1 = ptr;
 // change "qt" to "mov" since ffmpeg does not know qt
 			extension_ptr = asset->format != FILE_FFMPEG ? extensions.get(0) :
-				!strcmp(asset->fformat, "qt") ? "mov" : asset->fformat ;
+				!strcmp(asset->fformat, "qt" ) ||
+				!strcmp(asset->fformat, "pro" ) ? "mov" : asset->fformat ;
 			while(*extension_ptr != 0 && *extension_ptr != '/')
 				*ptr1++ = *extension_ptr++;
 			*ptr1 = 0;
@@ -465,6 +466,10 @@ void FormatTools::reposition_window(int &init_x, int &init_y)
 	format_text->reposition_window(x, y);
 	x += format_text->get_w();
 	format_button->reposition_window(x, y);
+	x += format_button->get_w() + 5;
+	ffmpeg_type->reposition_window(x, y);
+	x += ffmpeg_type->get_w();
+	format_ffmpeg->reposition_window(x, y);
 
 	x = init_x;
 	y += format_button->get_h() + ys10;
@@ -743,6 +748,7 @@ int FormatFormat::handle_event()
 			asset->video_data = File::renders_video(asset);
 			asset->ff_audio_options[0] = 0;
 			asset->ff_video_options[0] = 0;
+			asset->ff_format_options[0] = 0;
 			format->format_text->update(selection->get_text());
 			if( !format->use_brender )
 				format->update_extension();
@@ -773,8 +779,10 @@ int FormatFFMPEG::handle_event()
 	if( selection ) {
 		const char *text = get_selection(0, 0)->get_text();
 		format->ffmpeg_type->update(text);
+// forces options load defaults
 		format->asset->ff_audio_options[0] = 0;
 		format->asset->ff_video_options[0] = 0;
+		format->asset->ff_format_options[0] = 0;
 		FFMPEG::set_asset_format(format->asset, format->mwindow->edl, text);
 		format->update_extension();
 		format->close_format_windows();