update mac iraspa.pro

iRASPA · Aug 27, 2024 · a72b127 · a72b127
1 parent eb3677d
commit a72b127
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/iraspa/iraspa.pro b/iraspa/iraspa.pro
@@ -88,15 +88,15 @@ macx{
     #QMAKE_CXXFLAGS += -Wl,--stack,4194304
     QMAKE_CXXFLAGS += -g -std=c++17 -Wall -Wextra -Wshadow -Wnon-virtual-dtor -pedantic -Wno-gnu-anonymous-struct
     INCLUDEPATH += $$system(/usr/local/bin/python3-config --include | sed -e 's:-I::g')
-    QMAKE_LFLAGS +=  -framework OpenCL -framework Accelerate /usr/local/Cellar/python@3.10/3.10.8/Frameworks/Python.framework/Versions/3.10/lib/libpython3.10.dylib
+    QMAKE_LFLAGS +=  -framework OpenCL -framework Accelerate /usr/local/Cellar/python@3.12/3.12.4/Frameworks/Python.framework/Versions/3.12/lib/libpython3.12.dylib
     LIBS += -L/usr/local/lib -lx264 -lswscale -lavutil -lavformat -lavcodec -llzma -lz
   }
 
   contains(DEFINES,USE_OPENGL) {
     #QMAKE_CXXFLAGS += -Wl,--stack,4194304
     INCLUDEPATH += /usr/local/include
     INCLUDEPATH += $$system(/usr/local/bin/python3-config --include | sed -e 's:-I::g')
-    QMAKE_LFLAGS +=  -framework OpenCL -framework Accelerate /usr/local/Cellar/python@3.10/3.10.8/Frameworks/Python.framework/Versions/3.10/lib/libpython3.10.dylib
+    QMAKE_LFLAGS +=  -framework OpenCL -framework Accelerate /usr/local/Cellar/python@3.12/3.12.4/Frameworks/Python.framework/Versions/3.12/lib/libpython3.12.dylib
 
     CONFIG(debug, debug|release){
       QMAKE_CXXFLAGS += -g -O0 -std=c++17 -Wall -Wextra -Wshadow -Wnon-virtual-dtor -pedantic -Wno-gnu-anonymous-struct  -fsanitize=address

diff --git a/iraspa/iraspagui/moviemaker.cpp b/iraspa/iraspagui/moviemaker.cpp
@@ -40,7 +40,6 @@ int MovieWriter::initialize(const std::string filename)
     _logReporter->logMessage(LogReporting::ErrorLevel::verbose, "ffmpeg start initialization");
   }
   qDebug() << "ffmpeg start initialization";
-  qDebug() << filename;
 
   #if LIBAVCODEC_VERSION_MAJOR < 56
     // register is needed on Ubuntu 18 for snaps

diff --git a/iraspa/iraspagui/moviemaker.h b/iraspa/iraspagui/moviemaker.h
@@ -66,7 +66,11 @@ public :
   const unsigned int _width, _height;
   int _fps;
   SwsContext* _swsCtx;
+#if LIBAVCODEC_VERSION_MAJOR >= 60
   const AVOutputFormat* _oformat;
+#else
+  AVOutputFormat* _oformat;
+#endif
   AVStream* _videoStream;
   AVFormatContext* _ofctx;
   AVCodecContext* _cctx;