mirror of
https://github.com/Genymobile/scrcpy
synced 2024-11-11 01:10:32 +00:00
Upgrade FFmpeg (7.0.1) for Windows
This commit is contained in:
parent
1e3deabd6c
commit
48c2c03093
@ -4,10 +4,10 @@ DEPS_DIR=$(dirname ${BASH_SOURCE[0]})
|
|||||||
cd "$DEPS_DIR"
|
cd "$DEPS_DIR"
|
||||||
. common
|
. common
|
||||||
|
|
||||||
VERSION=6.1.1
|
VERSION=7.0.1
|
||||||
FILENAME=ffmpeg-$VERSION.tar.xz
|
FILENAME=ffmpeg-$VERSION.tar.xz
|
||||||
PROJECT_DIR=ffmpeg-$VERSION
|
PROJECT_DIR=ffmpeg-$VERSION
|
||||||
SHA256SUM=8684f4b00f94b85461884c3719382f1261f0d9eb3d59640a1f4ac0873616f968
|
SHA256SUM=bce9eeb0f17ef8982390b1f37711a61b4290dc8c2a0c1a37b5857e85bfb0e4ff
|
||||||
|
|
||||||
cd "$SOURCES_DIR"
|
cd "$SOURCES_DIR"
|
||||||
|
|
||||||
@ -17,7 +17,6 @@ then
|
|||||||
else
|
else
|
||||||
get_file "https://ffmpeg.org/releases/$FILENAME" "$FILENAME" "$SHA256SUM"
|
get_file "https://ffmpeg.org/releases/$FILENAME" "$FILENAME" "$SHA256SUM"
|
||||||
tar xf "$FILENAME" # First level directory is "$PROJECT_DIR"
|
tar xf "$FILENAME" # First level directory is "$PROJECT_DIR"
|
||||||
patch -d "$PROJECT_DIR" -p1 < "$PATCHES_DIR"/ffmpeg-6.1-fix-build.patch
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
mkdir -p "$BUILD_DIR/$PROJECT_DIR"
|
mkdir -p "$BUILD_DIR/$PROJECT_DIR"
|
||||||
|
@ -1,27 +0,0 @@
|
|||||||
From 03c80197afb324da38c9b70254231e3fdcfa68fc Mon Sep 17 00:00:00 2001
|
|
||||||
From: Romain Vimont <rom@rom1v.com>
|
|
||||||
Date: Sun, 12 Nov 2023 17:58:50 +0100
|
|
||||||
Subject: [PATCH] Fix FFmpeg 6.1 build
|
|
||||||
|
|
||||||
Build failed on tag n6.1 With --enable-decoder=av1 but without
|
|
||||||
--enable-muxer=av1.
|
|
||||||
---
|
|
||||||
libavcodec/Makefile | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
|
|
||||||
index 580a8d6b54..aff19b670c 100644
|
|
||||||
--- a/libavcodec/Makefile
|
|
||||||
+++ b/libavcodec/Makefile
|
|
||||||
@@ -249,7 +249,7 @@ OBJS-$(CONFIG_ATRAC3PAL_DECODER) += atrac3plusdec.o atrac3plus.o \
|
|
||||||
OBJS-$(CONFIG_ATRAC9_DECODER) += atrac9dec.o
|
|
||||||
OBJS-$(CONFIG_AURA_DECODER) += cyuv.o
|
|
||||||
OBJS-$(CONFIG_AURA2_DECODER) += aura.o
|
|
||||||
-OBJS-$(CONFIG_AV1_DECODER) += av1dec.o
|
|
||||||
+OBJS-$(CONFIG_AV1_DECODER) += av1dec.o av1_parse.o
|
|
||||||
OBJS-$(CONFIG_AV1_CUVID_DECODER) += cuviddec.o
|
|
||||||
OBJS-$(CONFIG_AV1_MEDIACODEC_DECODER) += mediacodecdec.o
|
|
||||||
OBJS-$(CONFIG_AV1_MEDIACODEC_ENCODER) += mediacodecenc.o
|
|
||||||
--
|
|
||||||
2.42.0
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user