Display and control your Android device
Upgrade FFmpeg build to 6.0-scrcpy-3
Romain Vimonta166eee909a6
diff --git a/app/prebuilt-deps/prepare-ffmpeg.sh b/app/prebuilt-deps/prepare-ffmpeg.shindex b156099a..3533ded4 100755--- a/app/prebuilt-deps/prepare-ffmpeg.sh+++ b/app/prebuilt-deps/prepare-ffmpeg.sh@@ -6,11 +6,11 @@ cd "$DIR"mkdir -p "$PREBUILT_DATA_DIR"cd "$PREBUILT_DATA_DIR"-VERSION=6.0-scrcpy-2+VERSION=6.0-scrcpy-3DEP_DIR="ffmpeg-$VERSION"FILENAME="$DEP_DIR".7z-SHA256SUM=98ef97f8607c97a5c4f9c5a0a991b78f105d002a3619145011d16ffb92501b14+SHA256SUM=36829d98ac4454d7092c72ddb92faa20b60450bc0fe8873076efb0858cdcbc2cif [[ -d "$DEP_DIR" ]]thendiff --git a/cross_win32.txt b/cross_win32.txtindex 18834af4..e8e8c7e8 100644--- a/cross_win32.txt+++ b/cross_win32.txt@@ -16,6 +16,6 @@ cpu = 'i686'endian = 'little'[properties]-prebuilt_ffmpeg = 'ffmpeg-6.0-scrcpy-2/win32'+prebuilt_ffmpeg = 'ffmpeg-6.0-scrcpy-3/win32'prebuilt_sdl2 = 'SDL2-2.26.4/i686-w64-mingw32'prebuilt_libusb = 'libusb-1.0.26/libusb-MinGW-Win32'diff --git a/cross_win64.txt b/cross_win64.txtindex 1c7c0875..d1de3c21 100644--- a/cross_win64.txt+++ b/cross_win64.txt@@ -16,6 +16,6 @@ cpu = 'x86_64'endian = 'little'[properties]-prebuilt_ffmpeg = 'ffmpeg-6.0-scrcpy-2/win64'+prebuilt_ffmpeg = 'ffmpeg-6.0-scrcpy-3/win64'prebuilt_sdl2 = 'SDL2-2.26.4/x86_64-w64-mingw32'prebuilt_libusb = 'libusb-1.0.26/libusb-MinGW-x64'diff --git a/release.mk b/release.mkindex 0f5cbe24..9fbd67c6 100644--- a/release.mk+++ b/release.mk@@ -94,11 +94,11 @@ dist-win32: build-server build-win32cp app/data/scrcpy-noconsole.vbs "$(DIST)/$(WIN32_TARGET_DIR)"cp app/data/icon.png "$(DIST)/$(WIN32_TARGET_DIR)"cp app/data/open_a_terminal_here.bat "$(DIST)/$(WIN32_TARGET_DIR)"- cp app/prebuilt-deps/data/ffmpeg-6.0-scrcpy-2/win32/bin/avutil-58.dll "$(DIST)/$(WIN32_TARGET_DIR)/"- cp app/prebuilt-deps/data/ffmpeg-6.0-scrcpy-2/win32/bin/avcodec-60.dll "$(DIST)/$(WIN32_TARGET_DIR)/"- cp app/prebuilt-deps/data/ffmpeg-6.0-scrcpy-2/win32/bin/avformat-60.dll "$(DIST)/$(WIN32_TARGET_DIR)/"- cp app/prebuilt-deps/data/ffmpeg-6.0-scrcpy-2/win32/bin/swresample-4.dll "$(DIST)/$(WIN32_TARGET_DIR)/"- cp app/prebuilt-deps/data/ffmpeg-6.0-scrcpy-2/win32/bin/zlib1.dll "$(DIST)/$(WIN32_TARGET_DIR)/"+ cp app/prebuilt-deps/data/ffmpeg-6.0-scrcpy-3/win32/bin/avutil-58.dll "$(DIST)/$(WIN32_TARGET_DIR)/"+ cp app/prebuilt-deps/data/ffmpeg-6.0-scrcpy-3/win32/bin/avcodec-60.dll "$(DIST)/$(WIN32_TARGET_DIR)/"+ cp app/prebuilt-deps/data/ffmpeg-6.0-scrcpy-3/win32/bin/avformat-60.dll "$(DIST)/$(WIN32_TARGET_DIR)/"+ cp app/prebuilt-deps/data/ffmpeg-6.0-scrcpy-3/win32/bin/swresample-4.dll "$(DIST)/$(WIN32_TARGET_DIR)/"+ cp app/prebuilt-deps/data/ffmpeg-6.0-scrcpy-3/win32/bin/zlib1.dll "$(DIST)/$(WIN32_TARGET_DIR)/"cp app/prebuilt-deps/data/platform-tools-34.0.1/adb.exe "$(DIST)/$(WIN32_TARGET_DIR)/"cp app/prebuilt-deps/data/platform-tools-34.0.1/AdbWinApi.dll "$(DIST)/$(WIN32_TARGET_DIR)/"cp app/prebuilt-deps/data/platform-tools-34.0.1/AdbWinUsbApi.dll "$(DIST)/$(WIN32_TARGET_DIR)/"@@ -113,11 +113,11 @@ dist-win64: build-server build-win64cp app/data/scrcpy-noconsole.vbs "$(DIST)/$(WIN64_TARGET_DIR)"cp app/data/icon.png "$(DIST)/$(WIN64_TARGET_DIR)"cp app/data/open_a_terminal_here.bat "$(DIST)/$(WIN64_TARGET_DIR)"- cp app/prebuilt-deps/data/ffmpeg-6.0-scrcpy-2/win64/bin/avutil-58.dll "$(DIST)/$(WIN64_TARGET_DIR)/"- cp app/prebuilt-deps/data/ffmpeg-6.0-scrcpy-2/win64/bin/avcodec-60.dll "$(DIST)/$(WIN64_TARGET_DIR)/"- cp app/prebuilt-deps/data/ffmpeg-6.0-scrcpy-2/win64/bin/avformat-60.dll "$(DIST)/$(WIN64_TARGET_DIR)/"- cp app/prebuilt-deps/data/ffmpeg-6.0-scrcpy-2/win64/bin/swresample-4.dll "$(DIST)/$(WIN64_TARGET_DIR)/"- cp app/prebuilt-deps/data/ffmpeg-6.0-scrcpy-2/win64/bin/zlib1.dll "$(DIST)/$(WIN64_TARGET_DIR)/"+ cp app/prebuilt-deps/data/ffmpeg-6.0-scrcpy-3/win64/bin/avutil-58.dll "$(DIST)/$(WIN64_TARGET_DIR)/"+ cp app/prebuilt-deps/data/ffmpeg-6.0-scrcpy-3/win64/bin/avcodec-60.dll "$(DIST)/$(WIN64_TARGET_DIR)/"+ cp app/prebuilt-deps/data/ffmpeg-6.0-scrcpy-3/win64/bin/avformat-60.dll "$(DIST)/$(WIN64_TARGET_DIR)/"+ cp app/prebuilt-deps/data/ffmpeg-6.0-scrcpy-3/win64/bin/swresample-4.dll "$(DIST)/$(WIN64_TARGET_DIR)/"+ cp app/prebuilt-deps/data/ffmpeg-6.0-scrcpy-3/win64/bin/zlib1.dll "$(DIST)/$(WIN64_TARGET_DIR)/"cp app/prebuilt-deps/data/platform-tools-34.0.1/adb.exe "$(DIST)/$(WIN64_TARGET_DIR)/"cp app/prebuilt-deps/data/platform-tools-34.0.1/AdbWinApi.dll "$(DIST)/$(WIN64_TARGET_DIR)/"cp app/prebuilt-deps/data/platform-tools-34.0.1/AdbWinUsbApi.dll "$(DIST)/$(WIN64_TARGET_DIR)/"