From fb7dfd18f5c381805df5e858e5870828752a9eac Mon Sep 17 00:00:00 2001 From: Good Guy Date: Wed, 2 Dec 2020 15:40:47 -0700 Subject: [PATCH] fix single frame, eg png, by Andrew; fix shortcuts error by Phyllis --- cinelerra-5.1/cinelerra/fileffmpeg.C | 2 ++ cinelerra-5.1/doc/shortcuts.html | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cinelerra-5.1/cinelerra/fileffmpeg.C b/cinelerra-5.1/cinelerra/fileffmpeg.C index eed14f20..43ed758b 100644 --- a/cinelerra-5.1/cinelerra/fileffmpeg.C +++ b/cinelerra-5.1/cinelerra/fileffmpeg.C @@ -345,8 +345,10 @@ int FileFFMPEG::open_file(int rd, int wr) 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); diff --git a/cinelerra-5.1/doc/shortcuts.html b/cinelerra-5.1/doc/shortcuts.html index 0f557c3a..ffa0889d 100644 --- a/cinelerra-5.1/doc/shortcuts.html +++ b/cinelerra-5.1/doc/shortcuts.html @@ -1185,7 +1185,7 @@ Edits Select Edits - Ctrl-Alt-a + Ctrl-Alt-' Add highlighted to selected edits -- 2.26.2