]> git.sesse.net Git - casparcg/commitdiff
2.0.2: ffmpeg/filter: Use safe_ptr for bypass container.
authorronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Sun, 4 Dec 2011 14:31:15 +0000 (14:31 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Sun, 4 Dec 2011 14:31:15 +0000 (14:31 +0000)
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.2@1782 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

modules/ffmpeg/producer/filter/filter.cpp

index ff6cd8abbfd0f9fb0c3f9b56b2ecdef4dcc4eba2..a6e8e2aad434f07cc32f7163eabd862ef418383e 100644 (file)
@@ -90,7 +90,7 @@ struct filter::implementation
        AVFilterContext*                                buffersrc_ctx_;\r
        std::shared_ptr<void>                   parallel_yadif_ctx_;\r
        std::vector<PixelFormat>                pix_fmts_;\r
-       std::queue<std::shared_ptr<AVFrame>> bypass_;\r
+       std::queue<safe_ptr<AVFrame>>   bypass_;\r
                \r
        implementation(const std::wstring& filters, const std::vector<PixelFormat>& pix_fmts) \r
                : filters_(narrow(filters))\r
@@ -127,7 +127,7 @@ struct filter::implementation
 \r
                if(filters_.empty())\r
                {\r
-                       bypass_.push(frame);\r
+                       bypass_.push(make_safe_ptr(frame));\r
                        return;\r
                }\r
                \r