From 6190aafee0b7ad6b0c23b2e8ad69dd585511e70b Mon Sep 17 00:00:00 2001
From: qht <1003077897@qq.com>
Date: Mon, 31 Aug 2020 16:57:35 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0unix=20=E5=AE=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/libQtAV.pro            | 5 ++++-
 widgets/libQtAVWidgets.pro | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/libQtAV.pro b/src/libQtAV.pro
index 66c2a9a75..b007acd1c 100644
--- a/src/libQtAV.pro
+++ b/src/libQtAV.pro
@@ -660,5 +660,8 @@ MODULE_VERSION = $$VERSION
 # windows: Qt5AV.dll, not Qt1AV.dll
 !mac_framework: MODULE_VERSION = $${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
 !contains(QMAKE_HOST.os, Windows):include($$PROJECTROOT/deploy.pri)
+unix:!mac {
 QMAKE_LFLAGS_RPATH=
-unix:!mac:QMAKE_LFLAGS +="-Wl,-rpath,\'\$\$ORIGIN\'"
+QMAKE_LFLAGS +="-Wl,-rpath,\'\$\$ORIGIN\'"
+  }
+
diff --git a/widgets/libQtAVWidgets.pro b/widgets/libQtAVWidgets.pro
index 21bd84adb..f4c1db965 100644
--- a/widgets/libQtAVWidgets.pro
+++ b/widgets/libQtAVWidgets.pro
@@ -171,5 +171,7 @@ MODULE_VERSION = $$VERSION
 # windows: Qt5AV.dll, not Qt1AV.dll
 !mac_framework: MODULE_VERSION = $${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
 !contains(QMAKE_HOST.os, Windows):include($$PROJECTROOT/deploy.pri)
+unix:!mac {
 QMAKE_LFLAGS_RPATH=
-unix:!mac:QMAKE_LFLAGS +="-Wl,-rpath,\'\$\$ORIGIN\'"
+QMAKE_LFLAGS +="-Wl,-rpath,\'\$\$ORIGIN\'"
+  }

From f48269acc81247787a2e066b85e452d051d20ffd Mon Sep 17 00:00:00 2001
From: qht <1003077897@qq.com>
Date: Thu, 3 Sep 2020 20:32:14 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E5=AF=BC=E8=87=B4=E9=9F=B3=E9=A2=91=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E6=92=AD=E6=94=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/AVPlayer.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/AVPlayer.cpp b/src/AVPlayer.cpp
index 1553e189a..c97945e84 100644
--- a/src/AVPlayer.cpp
+++ b/src/AVPlayer.cpp
@@ -1275,10 +1275,9 @@ void AVPlayer::slotopenDecodecFinish()
 {    
     qDebug("QHT AVPlayer::slotopenDecodecFinish");
     disconnect(this,SIGNAL(openDecodecFinish()),this,SLOT(slotopenDecodecFinish()));
-    //QHT video 不允许缺失  audio 允许缺失
-    if (!d->vthread) {
+    if (!d->vthread && !d->athread) {
         d->loaded = false;
-        qWarning("QHT AVPlayer::slotopenDecodecFinish load Video failed");
+        qWarning("QHT AVPlayer::slotopenDecodecFinish load failed");
         return;
     }
     {