X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Ffileffmpeg.C;h=58125d691c8b82856759326f7891e864de0d6cb7;hp=eed14f2005f6c8044a19c9bf3a0fbf577ffba192;hb=97ed925c86313b57c13a2db0fb9aa48822fe76ba;hpb=85a4302e7031b0285aeb9559aa6dbc531db6e443 diff --git a/cinelerra-5.1/cinelerra/fileffmpeg.C b/cinelerra-5.1/cinelerra/fileffmpeg.C index eed14f20..58125d69 100644 --- a/cinelerra-5.1/cinelerra/fileffmpeg.C +++ b/cinelerra-5.1/cinelerra/fileffmpeg.C @@ -343,10 +343,11 @@ int FileFFMPEG::open_file(int rd, int wr) if( video_layers > 0 ) { asset->video_data = 1; asset->aspect_ratio = ff->ff_aspect_ratio(0); - printf("ff_aspect_ratio, %f \n", asset->aspect_ratio); if (!asset->interlace_mode) asset->interlace_mode = ff->ff_interlace(0); + if ( ff->ff_video_frames(0) > 1 ) { ff->video_probe(1); if (!asset->interlace_mode && (ff->interlace_from_codec) ) asset->interlace_mode = ff->video_probe(1); + } if( !asset->layers ) asset->layers = video_layers; asset->actual_width = ff->ff_video_width(0); asset->actual_height = ff->ff_video_height(0); @@ -1943,9 +1944,9 @@ int FFOptionsFormatView::handle_event() { Asset *asset = fmt_config->asset; char *format_name = asset->fformat; - char *replace_name0 = "mov"; - char *replace_name1 = "mpegts"; - char *replace_name2 = "matroska"; + char replace_name0[] = "mov"; + char replace_name1[] = "mpegts"; + char replace_name2[] = "matroska"; if (!strcmp(format_name, "qt")) format_name = replace_name0; // fixup if (!strcmp(format_name, "m2ts"))