Merge branch 'master' into ocio_node

app/render/opengl/openglrenderer.cpp

@@ -20,6 +20,7 @@
 
 #include "openglrenderer.h"
 
+#include <iostream>
 #include <QDateTime>
 #include <QDebug>
 #include <QOpenGLExtraFunctions>

app/render/videoparams.cpp

@@ -20,6 +20,10 @@
 
 #include "videoparams.h"
 
+extern "C" {
+#include <libavutil/avutil.h>
+}
+
 #include <QtMath>
 
 #include "core.h"