X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fformattools.C;h=68dd6afd24670fd9804481d603909b54308095fe;hb=686c4d754c80b9865c0a5a7315c5fa4d0d39f4a7;hp=0979dfa46f7d22a956e7ac9bc5bc0f81386dfaa6;hpb=3abbd84aa85907d646b13c98295ce778d2a71215;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/cinelerra/formattools.C b/cinelerra-5.1/cinelerra/formattools.C index 0979dfa4..68dd6afd 100644 --- a/cinelerra-5.1/cinelerra/formattools.C +++ b/cinelerra-5.1/cinelerra/formattools.C @@ -129,6 +129,9 @@ void FormatTools::create_objects( this->prompt_video_compression = prompt_video_compression; this->file_per_label = file_per_label; + + if(asset->format == FILE_UNKNOWN) + asset->format = FILE_FFMPEG; //printf("FormatTools::create_objects 1\n"); if(!recording) @@ -748,6 +751,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(); @@ -778,8 +782,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();