Merge branch 'refs/heads/dev' into plugin

# Conflicts:
#	.gitmodules
#	CMakeLists.txt
#	ext/core

app/render/texture.h

@@ -19,6 +19,8 @@
 #ifndef RENDERTEXTURE_H
 #define RENDERTEXTURE_H
 
+#include "common/ffmpegutils.h"
+
 #include <memory>
 #include <QVariant>
 
@@ -148,7 +150,10 @@ public:
 	{
 		return job_;
 	}
-
+	void handleFrame(AVFramePtr ptr)
+	{
+		frame_=ptr;
+	}
 private:
 	Renderer *renderer_;
 
@@ -157,6 +162,8 @@ private:
 	QVariant id_;
 
 	AcceleratedJob *job_;
+
+	AVFramePtr frame_;
 };
 
 }