merge: repair break in audio capture

[goodguy/history.git] / cinelerra-5.1 / cinelerra / formattools.C

diff --git a/cinelerra-5.1/cinelerra/formattools.C b/cinelerra-5.1/cinelerra/formattools.C
index 37810a8ee748275695d04799c7ba152429f58337..28f4b556461f7a1337a9272df7c7f497dcaa7637 100644 (file)
--- a/cinelerra-5.1/cinelerra/formattools.C
+++ b/cinelerra-5.1/cinelerra/formattools.C
@@ -493,14 +493,14 @@ void FormatTools::update(Asset *asset, int *strategy)
 void FormatTools::close_format_windows()
 {
 // This is done in ~file
-       if(aparams_thread && aparams_thread->running())
-       {
-               aparams_thread->file->close_window();
+       if( aparams_thread ) {
+               if( aparams_thread->running() )
+                       aparams_thread->file->close_window();
                aparams_thread->join();
        }
-       if(vparams_thread && vparams_thread->running())
-       {
-               vparams_thread->file->close_window();
+       if( vparams_thread ) {
+               if( vparams_thread->running() )
+                       vparams_thread->file->close_window();
                vparams_thread->join();
        }
 }
@@ -823,6 +823,8 @@ int FormatFormat::handle_event()
                        asset->format = new_format;
                        asset->audio_data = File::supports_audio(asset->format);
                        asset->video_data = File::supports_video(asset->format);
+                       asset->ff_audio_options[0] = 0;
+                       asset->ff_video_options[0] = 0;
                        format->format_text->update(selection->get_text());
                        format->update_extension();
                        format->close_format_windows();
@@ -851,6 +853,8 @@ int FormatFFMPEG::handle_event()
        if( selection ) {
                char *text = get_selection(0, 0)->get_text();
                format->ffmpeg_type->update(text);
+               format->asset->ff_audio_options[0] = 0;
+               format->asset->ff_video_options[0] = 0;
                FFMPEG::set_asset_format(format->asset, text);
                format->update_extension();
                format->close_format_windows();