X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ffileffmpeg.C;fp=cinelerra-5.1%2Fcinelerra%2Ffileffmpeg.C;h=564306e656e82fce65b89cbe7555cde7bc72f902;hp=bfd7ed69b839a38568918c41c7852d65c607a171;hb=cbe947d378de6eaa11f38ec58b4f71c5c47f72bc;hpb=bb4d66ab59531240df079c4b115d8f4d202d29ad diff --git a/cinelerra-5.1/cinelerra/fileffmpeg.C b/cinelerra-5.1/cinelerra/fileffmpeg.C index bfd7ed69..564306e6 100644 --- a/cinelerra-5.1/cinelerra/fileffmpeg.C +++ b/cinelerra-5.1/cinelerra/fileffmpeg.C @@ -476,8 +476,8 @@ FFMPEGConfigAudio::FFMPEGConfigAudio(BC_WindowBase *parent_window, Asset *asset, FFMPEGConfigAudio::~FFMPEGConfigAudio() { - delete ff_options_dialog; lock_window("FFMPEGConfigAudio::~FFMPEGConfigAudio"); + delete ff_options_dialog; delete preset_popup; presets.remove_all_objects(); unlock_window(); @@ -1540,7 +1540,7 @@ int FFOptionsWindow::resize_event(int w, int h) int y0 = units->get_y(); text->reposition_window(x0,y0, x1-x0-xs8); panel_w = get_w()-xs10 - panel_x; - panel_h = get_h()-ys10 - panel_y; + panel_h = get_h()-ys10 - panel_y - BC_OKButton::calculate_h(); panel->reposition_window(panel_x,panel_y, panel_w, panel_h); return 1; }