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

6
src/DecklinkInput.cpp
View File

@@ -104,9 +104,9 @@ unsigned long DeckLinkInputDelegate::GetCurrentFrameNumber()
return 0;
}
tr1::shared_ptr<openshot::Frame> DeckLinkInputDelegate::GetFrame(long int requested_frame)
std::shared_ptr<openshot::Frame> DeckLinkInputDelegate::GetFrame(long int requested_frame)
{
tr1::shared_ptr<openshot::Frame> f;
std::shared_ptr<openshot::Frame> f;
// Is this frame for the future?
while (requested_frame > GetCurrentFrameNumber())
@@ -242,7 +242,7 @@ omp_set_nested(true);
m_rgbFrame->GetBytes(&frameBytes);
// *********** CREATE OPENSHOT FRAME **********
tr1::shared_ptr<openshot::Frame> f(new openshot::Frame(copy_frameCount, width, height, "#000000", 2048, 2));
std::shared_ptr<openshot::Frame> f(new openshot::Frame(copy_frameCount, width, height, "#000000", 2048, 2));
// Add Image data to openshot frame
// TODO: Fix Decklink support with QImage Upgrade