3

RealChuan · Jun 6, 2024 · d880d0d · d880d0d
1 parent 3bbfc44
commit d880d0d
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 9 deletions.
diff --git a/.github/actions/install-dependencies/action.yml b/.github/actions/install-dependencies/action.yml
@@ -91,9 +91,6 @@ runs:
           ffmpeg[${{ inputs.vcpkg_ffmpeg_features }}] --triplet arm64-osx \
           || (cat /usr/local/share/vcpkg/installed/vcpkg/issue_body.md && exit 1)
 
-        ls -al /opt/homebrew/include
-        ls -al /opt/homebrew/include | grep mpv
-
     - name: Install dependencies on linux
       if: startsWith(runner.os, 'Linux')
       shell: bash

diff --git a/examples/examples.pro b/examples/examples.pro
@@ -1,5 +1,5 @@
 TEMPLATE = subdirs
-CONFIG += ordered
+CONFIG += ordered BUILD_MPV
 
 SUBDIRS += \
     ffmpegplayer \

diff --git a/src/ffmpeg/codeccontext.cpp b/src/ffmpeg/codeccontext.cpp
@@ -168,7 +168,7 @@ class CodecContext::CodecContextPrivate
         codecCtx->global_quality = encodeContext.crf * FF_QP2LAMBDA;
         codecCtx->flags |= AV_CODEC_FLAG_QSCALE;
         if (encodeContext.codecInfo().name.contains("fdk")) {
-            auto vbr = QString::asprintf("%.1g", encodeContext.crf);
+            auto vbr = QString::asprintf("%.1d", encodeContext.crf);
             av_dict_set(&encodeOptions, "vbr", vbr.toUtf8().data(), 0);
         }
     }

diff --git a/src/mpv/mpv.pri b/src/mpv/mpv.pri
@@ -8,8 +8,8 @@ win32 {
 }
 
 macx {
-    INCLUDEPATH += /usr/local/include
-    LIBS += -L/usr/lib -L/usr/local/lib
+    INCLUDEPATH += /opt/homebrew/include
+    LIBS += -L/opt/homebrew/lib
     LIBS += -lmpv
 }
 

diff --git a/src/mpv/qthelper.hpp b/src/mpv/qthelper.hpp
@@ -122,7 +122,7 @@ struct node_builder
         // "QVariant::Type(obsolete), the return value should be interpreted
         // as QMetaType::Type."
         // So a cast really seems to be needed to avoid warnings (urgh).
-        return static_cast<int>(v.type()) == static_cast<int>(t);
+        return v.typeId() == static_cast<int>(t);
     }
     void set(mpv_node *dst, const QVariant &src)
     {

diff --git a/src/src.pro b/src/src.pro
@@ -1,5 +1,5 @@
 TEMPLATE = subdirs
-CONFIG += ordered
+CONFIG += ordered BUILD_MPV
 
 SUBDIRS += \
     utils \
@@ -10,3 +10,5 @@ SUBDIRS += \
 contains(CONFIG, BUILD_MPV) {
     SUBDIRS += mpv
 }
+
+message($$CONFIG)