summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDudemanguy <random342@airmail.cc>2023-08-30 12:38:11 -0500
committerDudemanguy <random342@airmail.cc>2023-08-30 12:44:43 -0500
commit57d26935c0525585482748b7236b60fe83d3f044 (patch)
tree7a34251a521dc7e88904adc3e8dcccb3c917d956
parent4a23c39dbed90d1968286e146ee0c48233963149 (diff)
downloadmpv-examples-master.tar.bz2
mpv-examples-master.tar.xz
qt_opengl/qml: fix gl_init_params initializationHEADmaster
In-class initialization in c++ requires an explicit size declaration. Otherwise, the compile fails with "too many initializers".
-rw-r--r--libmpv/qml/main.cpp2
-rw-r--r--libmpv/qt_opengl/mpvwidget.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/libmpv/qml/main.cpp b/libmpv/qml/main.cpp
index 033c1af..6aac9b9 100644
--- a/libmpv/qml/main.cpp
+++ b/libmpv/qml/main.cpp
@@ -58,7 +58,7 @@ public:
// init mpv_gl:
if (!obj->mpv_gl)
{
- mpv_opengl_init_params gl_init_params{get_proc_address_mpv, nullptr, nullptr};
+ mpv_opengl_init_params gl_init_params[1] = {get_proc_address_mpv, nullptr};
mpv_render_param params[]{
{MPV_RENDER_PARAM_API_TYPE, const_cast<char *>(MPV_RENDER_API_TYPE_OPENGL)},
{MPV_RENDER_PARAM_OPENGL_INIT_PARAMS, &gl_init_params},
diff --git a/libmpv/qt_opengl/mpvwidget.cpp b/libmpv/qt_opengl/mpvwidget.cpp
index c32a443..07169bc 100644
--- a/libmpv/qt_opengl/mpvwidget.cpp
+++ b/libmpv/qt_opengl/mpvwidget.cpp
@@ -61,7 +61,7 @@ QVariant MpvWidget::getProperty(const QString &name) const
void MpvWidget::initializeGL()
{
- mpv_opengl_init_params gl_init_params{get_proc_address, nullptr, nullptr};
+ mpv_opengl_init_params gl_init_params[1] = {get_proc_address, nullptr};
mpv_render_param params[]{
{MPV_RENDER_PARAM_API_TYPE, const_cast<char *>(MPV_RENDER_API_TYPE_OPENGL)},
{MPV_RENDER_PARAM_OPENGL_INIT_PARAMS, &gl_init_params},