[vlc-devel] [PATCH] interop_dxva2: fix header comment

Alexandre Janniaux ajanni at videolabs.io
Mon Mar 1 15:52:23 UTC 2021


---
 doc/libvlc/QtGL/qtvlcwidget.cpp             | 4 ++--
 modules/video_output/opengl/interop_dxva2.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/libvlc/QtGL/qtvlcwidget.cpp b/doc/libvlc/QtGL/qtvlcwidget.cpp
index 935d99a6ba..c84395b48a 100644
--- a/doc/libvlc/QtGL/qtvlcwidget.cpp
+++ b/doc/libvlc/QtGL/qtvlcwidget.cpp
@@ -57,7 +57,7 @@ public:
     /// return the texture to be displayed
     QOpenGLFramebufferObject *getVideoFrame()
     {
-        std::lock_guard<QMutex> lock(m_text_lock);
+        QMutexLocker locker(&m_text_lock);
         if (m_updated) {
             std::swap(m_idx_swap, m_idx_display);
             m_updated = false;
@@ -133,7 +133,7 @@ public:
     static void swap(void* data)
     {
         VLCVideo* that = static_cast<VLCVideo*>(data);
-        std::lock_guard<QMutex> lock(that->m_text_lock);
+        QMutexLocker locker(&that->m_text_lock);
         that->m_updated = true;
         that->mWidget->update();
         std::swap(that->m_idx_swap, that->m_idx_render);
diff --git a/modules/video_output/opengl/interop_dxva2.c b/modules/video_output/opengl/interop_dxva2.c
index f8a9cb2d3a..ae76ee5ec1 100644
--- a/modules/video_output/opengl/interop_dxva2.c
+++ b/modules/video_output/opengl/interop_dxva2.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * direct3d9.c: Windows Direct3D9 video output module
+ * interop_dxva2.c: Windows DXVA2 interop for OpenGL module
  *****************************************************************************
  * Copyright (C) 2006-2014 VLC authors and VideoLAN
  *
-- 
2.30.1



More information about the vlc-devel mailing list