diff --git a/app/app.pro b/app/app.pro index 59d8504a..9123fd53 100644 --- a/app/app.pro +++ b/app/app.pro @@ -152,7 +152,7 @@ win32:!winrt { CONFIG += soundio discord-rpc } macx { - LIBS += -lssl -lcrypto -lavcodec.60 -lavutil.58 -lopus -framework SDL2 -framework SDL2_ttf + LIBS += -lssl -lcrypto -lavcodec.61 -lavutil.59 -lopus -framework SDL2 -framework SDL2_ttf LIBS += -lobjc -framework VideoToolbox -framework AVFoundation -framework CoreVideo -framework CoreGraphics -framework CoreMedia -framework AppKit -framework Metal -framework QuartzCore # For libsoundio diff --git a/app/streaming/video/ffmpeg-renderers/dxva2.cpp b/app/streaming/video/ffmpeg-renderers/dxva2.cpp index 0e81fc6e..9c7b1c89 100644 --- a/app/streaming/video/ffmpeg-renderers/dxva2.cpp +++ b/app/streaming/video/ffmpeg-renderers/dxva2.cpp @@ -21,6 +21,11 @@ DEFINE_GUID(DXVADDI_Intel_ModeH264_E, 0x604F8E68,0x4951,0x4C54,0x88,0xFE,0xAB,0xD2,0x5C,0x15,0xB3,0xD6); DEFINE_GUID(DXVA2_ModeAV1_VLD_Profile0,0xb8be4ccb,0xcf53,0x46ba,0x8d,0x59,0xd6,0xb8,0xa6,0xda,0x5d,0x2a); +// This was incorrectly removed from public headers in FFmpeg 7.0 +#ifndef FF_DXVA2_WORKAROUND_INTEL_CLEARVIDEO +#define FF_DXVA2_WORKAROUND_INTEL_CLEARVIDEO 2 +#endif + #define SAFE_COM_RELEASE(x) if (x) { (x)->Release(); } typedef struct _VERTEX diff --git a/libs b/libs index f292587e..5e1d46fd 160000 --- a/libs +++ b/libs @@ -1 +1 @@ -Subproject commit f292587e323adc815b2aea584d433e95a78cfeb3 +Subproject commit 5e1d46fdd8e0a697dafc197f9c8acb2c4632174d