Display and control your Android device
Upgrade FFmpeg (4.2.2) for Windows
Romain Vimontb55ca127f890
diff --git a/Makefile.CrossWindows b/Makefile.CrossWindowsindex 2b30dcb5..413088c7 100644--- a/Makefile.CrossWindows+++ b/Makefile.CrossWindows@@ -100,11 +100,11 @@ dist-win32: build-server build-win32 build-win32-noconsolecp "$(SERVER_BUILD_DIR)"/server/scrcpy-server "$(DIST)/$(WIN32_TARGET_DIR)/"cp "$(WIN32_BUILD_DIR)"/app/scrcpy.exe "$(DIST)/$(WIN32_TARGET_DIR)/"cp "$(WIN32_NOCONSOLE_BUILD_DIR)"/app/scrcpy.exe "$(DIST)/$(WIN32_TARGET_DIR)/scrcpy-noconsole.exe"- cp prebuilt-deps/ffmpeg-4.2.1-win32-shared/bin/avutil-56.dll "$(DIST)/$(WIN32_TARGET_DIR)/"- cp prebuilt-deps/ffmpeg-4.2.1-win32-shared/bin/avcodec-58.dll "$(DIST)/$(WIN32_TARGET_DIR)/"- cp prebuilt-deps/ffmpeg-4.2.1-win32-shared/bin/avformat-58.dll "$(DIST)/$(WIN32_TARGET_DIR)/"- cp prebuilt-deps/ffmpeg-4.2.1-win32-shared/bin/swresample-3.dll "$(DIST)/$(WIN32_TARGET_DIR)/"- cp prebuilt-deps/ffmpeg-4.2.1-win32-shared/bin/swscale-5.dll "$(DIST)/$(WIN32_TARGET_DIR)/"+ cp prebuilt-deps/ffmpeg-4.2.2-win32-shared/bin/avutil-56.dll "$(DIST)/$(WIN32_TARGET_DIR)/"+ cp prebuilt-deps/ffmpeg-4.2.2-win32-shared/bin/avcodec-58.dll "$(DIST)/$(WIN32_TARGET_DIR)/"+ cp prebuilt-deps/ffmpeg-4.2.2-win32-shared/bin/avformat-58.dll "$(DIST)/$(WIN32_TARGET_DIR)/"+ cp prebuilt-deps/ffmpeg-4.2.2-win32-shared/bin/swresample-3.dll "$(DIST)/$(WIN32_TARGET_DIR)/"+ cp prebuilt-deps/ffmpeg-4.2.2-win32-shared/bin/swscale-5.dll "$(DIST)/$(WIN32_TARGET_DIR)/"cp prebuilt-deps/platform-tools/adb.exe "$(DIST)/$(WIN32_TARGET_DIR)/"cp prebuilt-deps/platform-tools/AdbWinApi.dll "$(DIST)/$(WIN32_TARGET_DIR)/"cp prebuilt-deps/platform-tools/AdbWinUsbApi.dll "$(DIST)/$(WIN32_TARGET_DIR)/"@@ -115,11 +115,11 @@ dist-win64: build-server build-win64 build-win64-noconsolecp "$(SERVER_BUILD_DIR)"/server/scrcpy-server "$(DIST)/$(WIN64_TARGET_DIR)/"cp "$(WIN64_BUILD_DIR)"/app/scrcpy.exe "$(DIST)/$(WIN64_TARGET_DIR)/"cp "$(WIN64_NOCONSOLE_BUILD_DIR)"/app/scrcpy.exe "$(DIST)/$(WIN64_TARGET_DIR)/scrcpy-noconsole.exe"- cp prebuilt-deps/ffmpeg-4.2.1-win64-shared/bin/avutil-56.dll "$(DIST)/$(WIN64_TARGET_DIR)/"- cp prebuilt-deps/ffmpeg-4.2.1-win64-shared/bin/avcodec-58.dll "$(DIST)/$(WIN64_TARGET_DIR)/"- cp prebuilt-deps/ffmpeg-4.2.1-win64-shared/bin/avformat-58.dll "$(DIST)/$(WIN64_TARGET_DIR)/"- cp prebuilt-deps/ffmpeg-4.2.1-win64-shared/bin/swresample-3.dll "$(DIST)/$(WIN64_TARGET_DIR)/"- cp prebuilt-deps/ffmpeg-4.2.1-win64-shared/bin/swscale-5.dll "$(DIST)/$(WIN64_TARGET_DIR)/"+ cp prebuilt-deps/ffmpeg-4.2.2-win64-shared/bin/avutil-56.dll "$(DIST)/$(WIN64_TARGET_DIR)/"+ cp prebuilt-deps/ffmpeg-4.2.2-win64-shared/bin/avcodec-58.dll "$(DIST)/$(WIN64_TARGET_DIR)/"+ cp prebuilt-deps/ffmpeg-4.2.2-win64-shared/bin/avformat-58.dll "$(DIST)/$(WIN64_TARGET_DIR)/"+ cp prebuilt-deps/ffmpeg-4.2.2-win64-shared/bin/swresample-3.dll "$(DIST)/$(WIN64_TARGET_DIR)/"+ cp prebuilt-deps/ffmpeg-4.2.2-win64-shared/bin/swscale-5.dll "$(DIST)/$(WIN64_TARGET_DIR)/"cp prebuilt-deps/platform-tools/adb.exe "$(DIST)/$(WIN64_TARGET_DIR)/"cp prebuilt-deps/platform-tools/AdbWinApi.dll "$(DIST)/$(WIN64_TARGET_DIR)/"cp prebuilt-deps/platform-tools/AdbWinUsbApi.dll "$(DIST)/$(WIN64_TARGET_DIR)/"diff --git a/cross_win32.txt b/cross_win32.txtindex d13af0e2..17ad376f 100644--- a/cross_win32.txt+++ b/cross_win32.txt@@ -15,6 +15,6 @@ cpu = 'i686'endian = 'little'[properties]-prebuilt_ffmpeg_shared = 'ffmpeg-4.2.1-win32-shared'-prebuilt_ffmpeg_dev = 'ffmpeg-4.2.1-win32-dev'+prebuilt_ffmpeg_shared = 'ffmpeg-4.2.2-win32-shared'+prebuilt_ffmpeg_dev = 'ffmpeg-4.2.2-win32-dev'prebuilt_sdl2 = 'SDL2-2.0.10/i686-w64-mingw32'diff --git a/cross_win64.txt b/cross_win64.txtindex 09f387e1..faa95d28 100644--- a/cross_win64.txt+++ b/cross_win64.txt@@ -15,6 +15,6 @@ cpu = 'x86_64'endian = 'little'[properties]-prebuilt_ffmpeg_shared = 'ffmpeg-4.2.1-win64-shared'-prebuilt_ffmpeg_dev = 'ffmpeg-4.2.1-win64-dev'+prebuilt_ffmpeg_shared = 'ffmpeg-4.2.2-win64-shared'+prebuilt_ffmpeg_dev = 'ffmpeg-4.2.2-win64-dev'prebuilt_sdl2 = 'SDL2-2.0.10/x86_64-w64-mingw32'diff --git a/prebuilt-deps/Makefile b/prebuilt-deps/Makefileindex 892af6c7..0410a787 100644--- a/prebuilt-deps/Makefile+++ b/prebuilt-deps/Makefile@@ -10,24 +10,24 @@ prepare-win32: prepare-sdl2 prepare-ffmpeg-shared-win32 prepare-ffmpeg-dev-win32prepare-win64: prepare-sdl2 prepare-ffmpeg-shared-win64 prepare-ffmpeg-dev-win64 prepare-adbprepare-ffmpeg-shared-win32:- @./prepare-dep https://ffmpeg.zeranoe.com/builds/win32/shared/ffmpeg-4.2.1-win32-shared.zip \- 9208255f409410d95147151d7e829b5699bf8d91bfe1e81c3f470f47c2fa66d2 \- ffmpeg-4.2.1-win32-shared+ @./prepare-dep https://ffmpeg.zeranoe.com/builds/win32/shared/ffmpeg-4.2.2-win32-shared.zip \+ ab5d603aaa54de360db2c2ffe378c82376b9343ea1175421dd644639aa07ee31 \+ ffmpeg-4.2.2-win32-sharedprepare-ffmpeg-dev-win32:- @./prepare-dep https://ffmpeg.zeranoe.com/builds/win32/dev/ffmpeg-4.2.1-win32-dev.zip \- c3469e6c5f031cbcc8cba88dee92d6548c5c6b6ff14f4097f18f72a92d0d70c4 \- ffmpeg-4.2.1-win32-dev+ @./prepare-dep https://ffmpeg.zeranoe.com/builds/win32/dev/ffmpeg-4.2.2-win32-dev.zip \+ 8d224be567a2950cad4be86f4aabdd045bfa52ad758e87c72cedd278613bc6c8 \+ ffmpeg-4.2.2-win32-devprepare-ffmpeg-shared-win64:- @./prepare-dep https://ffmpeg.zeranoe.com/builds/win64/shared/ffmpeg-4.2.1-win64-shared.zip \- 55063d3cf750a75485c7bf196031773d81a1b25d0980c7db48ecfc7701a42331 \- ffmpeg-4.2.1-win64-shared+ @./prepare-dep https://ffmpeg.zeranoe.com/builds/win64/shared/ffmpeg-4.2.2-win64-shared.zip \+ 5aedf268952b7d9f6541dbfcb47cd86a7e7881a3b7ba482fd3bc4ca33bda7bf5 \+ ffmpeg-4.2.2-win64-sharedprepare-ffmpeg-dev-win64:- @./prepare-dep https://ffmpeg.zeranoe.com/builds/win64/dev/ffmpeg-4.2.1-win64-dev.zip \- 5af393be5f25c0a71aa29efce768e477c35347f7f8e0d9696767d5b9d405b74e \- ffmpeg-4.2.1-win64-dev+ @./prepare-dep https://ffmpeg.zeranoe.com/builds/win64/dev/ffmpeg-4.2.2-win64-dev.zip \+ f4885f859c5b0d6663c2a0a4c1cf035b1c60b146402790b796bd3ad84f4f3ca2 \+ ffmpeg-4.2.2-win64-devprepare-sdl2:@./prepare-dep https://libsdl.org/release/SDL2-devel-2.0.10-mingw.tar.gz \