fix single frame, eg png, by Andrew; fix shortcuts error by Phyllis master
authorGood Guy <good1.2guy@gmail.com>
Wed, 2 Dec 2020 22:40:47 +0000 (15:40 -0700)
committerGood Guy <good1.2guy@gmail.com>
Wed, 2 Dec 2020 22:40:47 +0000 (15:40 -0700)
cinelerra-5.1/cinelerra/fileffmpeg.C
cinelerra-5.1/doc/shortcuts.html

index eed14f2005f6c8044a19c9bf3a0fbf577ffba192..43ed758b7b56f5f541852abe32811f38ae2e9e78 100644 (file)
@@ -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);
index 0f557c3adfece8e2348a1cc57ff9d5f4db9b8180..ffa0889dc0340aee18d32095d66ff331f54fc438 100644 (file)
         <tr>
                 <td height="26" align="left"><b><font face="Liberation Serif" size=4>     Edits </font></b></td>
                 <td align="left"><font face="Liberation Serif" size=4>Select Edits</font></td>
-                <td align="left"><font face="Liberation Serif" size=4>Ctrl-Alt-a</font></td>
+                <td align="left"><font face="Liberation Serif" size=4>Ctrl-Alt-'</font></td>
                 <td align="left"><font face="Liberation Serif" size=4>Add highlighted to selected edits</font></td>
         </tr>
         <tr>