Merge branch 'refs/heads/dev' into plugin
# Conflicts: # .gitmodules # CMakeLists.txt # ext/core
This commit is contained in:
@@ -85,7 +85,7 @@ public:
|
||||
using AVFramePtr = std::shared_ptr<AVFrame>;
|
||||
inline AVFramePtr CreateAVFramePtr(AVFrame *f)
|
||||
{
|
||||
return std::shared_ptr<AVFrame>(f, [](AVFrame *g) { av_frame_free(&g); });
|
||||
return std::shared_ptr<AVFrame>(f, [](AVFrame *g) { av_frame_free(&g); });
|
||||
}
|
||||
inline AVFramePtr CreateAVFramePtr()
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user