X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fformattools.C;h=643655e3bcac6aabd41095a9df95fd8baac10fa9;hb=86c9537e0540010ff43b16feb4cd7de98409eba1;hp=03d8e83ece22dabb9d211683c0aa1974965d8326;hpb=0e6cf5b52d1ebce9272270144bcf43df4683507e;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/cinelerra/formattools.C b/cinelerra-5.1/cinelerra/formattools.C index 03d8e83e..643655e3 100644 --- a/cinelerra-5.1/cinelerra/formattools.C +++ b/cinelerra-5.1/cinelerra/formattools.C @@ -466,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; @@ -744,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(); @@ -774,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();