Merge branch 'master' into alpha

2018-12-23 11:49:10 +11:00
parent 5bb579e9d1 8c85ccd96e
commit abc0e2130c
5 changed files with 92 additions and 3 deletions
@@ -197,7 +197,8 @@ mac {
 }

 linux {
-    LIBS += -lavutil -lavformat -lavcodec -lavfilter -lswscale -lswresample
+    CONFIG += link_pkgconfig
+    PKGCONFIG += libavutil libavformat libavcodec libavfilter libswscale libswresample
 }

 RESOURCES += \