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/ImageWriter.cpp
View File

@@ -86,7 +86,7 @@ void ImageWriter::Open() throw(InvalidFile, InvalidCodec)
}
// Add a frame to the queue waiting to be encoded.
void ImageWriter::WriteFrame(tr1::shared_ptr<Frame> frame) throw(WriterClosed)
void ImageWriter::WriteFrame(std::shared_ptr<Frame> frame) throw(WriterClosed)
{
// Check for open reader (or throw exception)
if (!is_open)
@@ -94,7 +94,7 @@ void ImageWriter::WriteFrame(tr1::shared_ptr<Frame> frame) throw(WriterClosed)
// Copy and resize image
tr1::shared_ptr<Magick::Image> frame_image = frame->GetMagickImage();
std::shared_ptr<Magick::Image> frame_image = frame->GetMagickImage();
frame_image->magick( info.vcodec );
frame_image->backgroundColor(Magick::Color("none"));
frame_image->matte(true);
@@ -128,7 +128,7 @@ void ImageWriter::WriteFrame(ReaderBase* reader, long int start, long int length
for (long int number = start; number <= length; number++)
{
// Get the frame
tr1::shared_ptr<Frame> f = reader->GetFrame(number);
std::shared_ptr<Frame> f = reader->GetFrame(number);
// Encode frame
WriteFrame(f);