openshot/libopenshot
0
0
Fork 0
mirror of https://github.com/OpenShot/libopenshot.git synced 2026-03-02 08:53:52 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #563 from ferdnyc/timeline-lookup-api

Browse Source 
Timeline: Add clip/effect lookup api, GetMaxFrame/GetMaxTime method (w/ unit tests)
This commit is contained in:
Frank Dana
2020-09-10 19:06:44 -04:00
committed by GitHub
parent 6cc00d6e47 f33d5cb261
commit 131e441d98
9 changed files with 319 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/FFmpegReader.cpp
View File

@@ -1296,7 +1296,7 @@ void FFmpegReader::ProcessVideoPacket(int64_t requested_frame) {
if (max_height <= 0)
max_height = info.height;
Clip *parent = (Clip *) GetClip();
Clip *parent = (Clip *) GetParentClip();
if (parent) {
if (parent->scale == SCALE_FIT || parent->scale == SCALE_STRETCH) {
// Best fit or Stretch scaling (based on max timeline size * scaling keyframes)