Merge pull request #412 from valbok/atomic-abort

Fix deadlock in QAVDemuxer::unload
valbok · Oct 29, 2023 · 64d39e0 · 64d39e0
2 parents 5864861 + 874aef4
commit 64d39e0
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/QtAVPlayer/qavdemuxer.cpp b/src/QtAVPlayer/qavdemuxer.cpp
@@ -41,10 +41,10 @@ extern "C" {
 }
 #endif
 
-#include <QAtomicInt>
 #include <QDir>
 #include <QSharedPointer>
 #include <QMutexLocker>
+#include <atomic>
 #include <QDebug>
 
 extern "C" {
@@ -71,7 +71,7 @@ class QAVDemuxerPrivate
     AVFormatContext *ctx = nullptr;
     AVBSFContext *bsf_ctx = nullptr;
 
-    bool abortRequest = false;
+    std::atomic_bool abortRequest = false;
     mutable QMutex mutex;
 
     bool seekable = false;
@@ -92,7 +92,6 @@ class QAVDemuxerPrivate
 static int decode_interrupt_cb(void *ctx)
 {
     auto d = reinterpret_cast<QAVDemuxerPrivate *>(ctx);
-    QMutexLocker locker(&d->mutex);
     return d ? int(d->abortRequest) : 0;
 }