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 branch 'clip-refactor-keyframes' of https://github.com/OpenShot/libopenshot into clip-refactor-keyframes

Browse Source
This commit is contained in:
FeRD (Frank Dana)
2020-10-19 16:26:09 -04:00
parent d2521bcbff 29107bc427
commit f4ae897240
5 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/QtImageReader.cpp
View File

@@ -174,7 +174,7 @@ std::shared_ptr<Frame> QtImageReader::GetFrame(int64_t requested_frame)
int max_width = info.width;
int max_height = info.height;
Clip* parent = (Clip*) GetParentClip();
Clip* parent = (Clip*) ParentClip();
if (parent) {
if (parent->ParentTimeline()) {
// Set max width/height based on parent clip's timeline (if attached to a timeline)