[ffmpeg] Copied flush logic when seeking from 2.0, as well as current frame in clip...

[casparcg] / modules / ffmpeg / producer / util / util.cpp

diff --git a/modules/ffmpeg/producer/util/util.cpp b/modules/ffmpeg/producer/util/util.cpp
index 652a9a7ccc9b4107154d9e436d4ac0d4e5644080..eb773c6c115f5818572bdee16ddd1072e409a4ba 100644 (file)
--- a/modules/ffmpeg/producer/util/util.cpp
+++ b/modules/ffmpeg/producer/util/util.cpp
@@ -491,6 +491,16 @@ spl::shared_ptr<AVFrame> create_frame()
        return frame;
 }
 
+std::shared_ptr<AVFrame> flush()
+{
+       static std::shared_ptr<AVFrame> dummy(av_frame_alloc(), [](AVFrame* p)
+       {
+               av_frame_free(&p);
+       });
+
+       return dummy;
+}
+
 spl::shared_ptr<AVCodecContext> open_codec(AVFormatContext& context, enum AVMediaType type, int& index, bool single_threaded)
 {      
        AVCodec* decoder;
@@ -588,7 +598,7 @@ bool is_valid_file(const std::wstring& filename, bool only_video)
                buf.push_back(*file_it);
 
        if(buf.empty())
-               return nullptr;
+               return false;
 
        pb.buf          = buf.data();
        pb.buf_size = static_cast<int>(buf.size());