Bump ffmpeg version

CMake/Helpers/CMakeMacOS.cmake

@@ -18,11 +18,21 @@ find_library(MAC_FRAME_CARBON Carbon)
 find_library(MAC_FRAME_COREAUDIO CoreAudio)
 find_library(MAC_FRAME_IOKIT IOKit)
 find_library(MAC_FRAME_METAL Metal)
+find_library(MAC_FRAME_VIDEO CoreVideo)
+find_library(MAC_FRAME_VIDEODECODEACCELERATION VideoDecodeAcceleration)
+find_library(MAC_FRAME_COREMEDIA CoreMedia)
+find_library(MAC_FRAME_VIDEOTOOLBOX VideoToolbox)
+find_library(MAC_FRAME_AUDIOTOOLBOX AudioToolbox)
 target_link_libraries(Etterna PRIVATE ${MAC_FRAME_AUDIOUNIT})
 target_link_libraries(Etterna PRIVATE ${MAC_FRAME_CARBON})
 target_link_libraries(Etterna PRIVATE ${MAC_FRAME_COREAUDIO})
 target_link_libraries(Etterna PRIVATE ${MAC_FRAME_IOKIT})
 target_link_libraries(Etterna PRIVATE ${MAC_FRAME_METAL})
+target_link_libraries(Etterna PRIVATE ${MAC_FRAME_VIDEO})
+target_link_libraries(Etterna PRIVATE ${MAC_FRAME_VIDEODECODEACCELERATION})
+target_link_libraries(Etterna PRIVATE ${MAC_FRAME_COREMEDIA})
+target_link_libraries(Etterna PRIVATE ${MAC_FRAME_VIDEOTOOLBOX})
+target_link_libraries(Etterna PRIVATE ${MAC_FRAME_AUDIOTOOLBOX})
 
 # Extern Libraries
 target_link_libraries(Etterna PRIVATE ffmpeg)
@@ -35,3 +45,7 @@ target_link_libraries(Etterna PRIVATE ${OPENGL_LIBRARIES})
 target_link_libraries(Etterna PRIVATE ${BZIP2_LIBRARIES})
 target_link_libraries(Etterna PUBLIC ${ICONV_LIBRARIES})
 
+# lzma
+include(FindLibLZMA)
+target_link_libraries(Etterna PUBLIC ${LIBLZMA_LIBRARIES})
+

CMake/Helpers/CMakeWindows.cmake

@@ -34,10 +34,11 @@ else()
 endif()
 
 list(APPEND WIN_DLLS
-	"${PROJECT_SOURCE_DIR}/extern/ffmpeg/windows/${ARCH}/avcodec-55.dll"
-	"${PROJECT_SOURCE_DIR}/extern/ffmpeg/windows/${ARCH}/avformat-55.dll"
-	"${PROJECT_SOURCE_DIR}/extern/ffmpeg/windows/${ARCH}/avutil-52.dll"
-	"${PROJECT_SOURCE_DIR}/extern/ffmpeg/windows/${ARCH}/swscale-2.dll")
+	"${PROJECT_SOURCE_DIR}/extern/ffmpeg/windows/${ARCH}/avcodec-58.dll"
+	"${PROJECT_SOURCE_DIR}/extern/ffmpeg/windows/${ARCH}/avformat-58.dll"
+	"${PROJECT_SOURCE_DIR}/extern/ffmpeg/windows/${ARCH}/avutil-56.dll"
+	"${PROJECT_SOURCE_DIR}/extern/ffmpeg/windows/${ARCH}/swscale-5.dll"
+	"${PROJECT_SOURCE_DIR}/extern/ffmpeg/windows/${ARCH}/swresample-3.dll")
 
 foreach(dll ${WIN_DLLS})
 	# We remove the dlls if they exist already in /Program/ in case we run a different ARCH target before

CMake/Helpers/CPackSetup.cmake

@@ -46,8 +46,8 @@ if(WIN32)
     set(INSTALL_DIR ".")
 
     # List every DLL etterna needs.
-    list(APPEND WIN_DLLS "${PROJECT_SOURCE_DIR}/Program/avcodec-55.dll" "${PROJECT_SOURCE_DIR}/Program/avformat-55.dll"
-                         "${PROJECT_SOURCE_DIR}/Program/avutil-52.dll" "${PROJECT_SOURCE_DIR}/Program/swscale-2.dll"
+    list(APPEND WIN_DLLS "${PROJECT_SOURCE_DIR}/Program/avcodec-58.dll" "${PROJECT_SOURCE_DIR}/Program/avformat-58.dll"
+                         "${PROJECT_SOURCE_DIR}/Program/avutil-56.dll" "${PROJECT_SOURCE_DIR}/Program/swscale-5.dll" "${PROJECT_SOURCE_DIR}/Program/swresample-3.dll"
                          ${PROJECT_BINARY_DIR}/gn_crashpad/crashpad_handler.exe)
     install(FILES ${WIN_DLLS}   COMPONENT Etterna DESTINATION Program)
     install(TARGETS Etterna     COMPONENT Etterna DESTINATION Program)

CMake/Helpers/SetupFFMPEG.cmake

@@ -1,6 +1,6 @@
 include(ExternalProject)
 
-set(FFMPEG_ROOT "${PROJECT_BINARY_DIR}/ffmpeg_dl/ffmpeg-2.1.3-src")
+set(FFMPEG_ROOT "${PROJECT_BINARY_DIR}/ffmpeg_dl/ffmpeg-4.4-src")
 set(FFMPEG_BIN  "${PROJECT_BINARY_DIR}/ffmpeg_dl/ffmpeg_dl-build")
 
 list(APPEND FFMPEG_CONFIGURE
@@ -51,7 +51,7 @@ ExternalProject_Add(ffmpeg_dl
     GIT_REPOSITORY "https://github.com/etternagame/ffmpeg.git"
     GIT_PROGRESS TRUE
     GIT_SHALLOW TRUE
-    GIT_TAG "n2.1.3"
+    GIT_TAG "n4.4"
 
     BUILD_BYPRODUCTS ${FFMPEG_BUILD_LIBS}
     SOURCE_DIR ${FFMPEG_ROOT}