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

Migrating tr1 to std, adding C++11 support to build scripts, fixing crash in FFmpegReader (caused by shared_ptr, buffer, and last_video_frame corruption). Much improved stability with this change. Thanks to Craig and Peter for the help!

Browse Source
This commit is contained in:
Jonathan Thomas
2017-08-20 17:37:39 -05:00
parent 564664737a
commit f12ffe692b
84 changed files with 605 additions and 641 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/DecklinkReader.cpp
View File

@@ -231,10 +231,10 @@ unsigned long DecklinkReader::GetCurrentFrameNumber()
}
// Get an openshot::Frame object for the next available LIVE frame
tr1::shared_ptr<Frame> DecklinkReader::GetFrame(long int requested_frame) throw(ReaderClosed)
std::shared_ptr<Frame> DecklinkReader::GetFrame(long int requested_frame) throw(ReaderClosed)
{
// Get a frame from the delegate decklink class (which is collecting them on another thread)
tr1::shared_ptr<Frame> f = delegate->GetFrame(requested_frame);
std::shared_ptr<Frame> f = delegate->GetFrame(requested_frame);
// cout << "Change the frame number to " << requested_frame << endl;
// f->SetFrameNumber(requested_frame);