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

use reader instead of new_reader

Browse Source
This commit is contained in:
Jeff Shillitto
2020-05-19 19:57:06 +10:00
parent 4e6c1819b0
commit 5b5950c991
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Clip.cpp
View File

@@ -148,11 +148,10 @@ Clip::Clip(ReaderBase* new_reader) : resampler(NULL), reader(new_reader), alloca
Open();
Close();
// Update duration
End(reader->info.duration);
if (new_reader) {
new_reader->SetClip(this);
// Update duration and set parent
if (reader) {
End(reader->info.duration);
reader->SetClip(this);
}
}
@@ -206,9 +205,10 @@ Clip::Clip(std::string path) : resampler(NULL), reader(NULL), allocated_reader(N
}
}
// Update duration
// Update duration and set parent
if (reader) {
End(reader->info.duration);
reader->SetClip(this);
allocated_reader = reader;
init_reader_rotation();
}