diff --git a/packages/addons/addon-depends/ffmpegx/package.mk b/packages/addons/addon-depends/ffmpegx/package.mk index 878208be57..216a04ed72 100644 --- a/packages/addons/addon-depends/ffmpegx/package.mk +++ b/packages/addons/addon-depends/ffmpegx/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="ffmpegx" -PKG_VERSION="7.1" -PKG_SHA256="40973d44970dbc83ef302b0609f2e74982be2d85916dd2ee7472d30678a7abe6" +PKG_VERSION="7.1.1" +PKG_SHA256="733984395e0dbbe5c046abda2dc49a5544e7e0e1e2366bba849222ae9e3a03b1" PKG_LICENSE="GPL-3.0-only" PKG_SITE="https://ffmpeg.org" PKG_URL="https://ffmpeg.org/releases/ffmpeg-${PKG_VERSION}.tar.xz" diff --git a/packages/addons/addon-depends/ffmpegx/patches/ffmpeg-04-lavc-libx265--unbreak-build-for-X265-BUILD---213.patch b/packages/addons/addon-depends/ffmpegx/patches/ffmpeg-04-lavc-libx265--unbreak-build-for-X265-BUILD---213.patch deleted file mode 100644 index 839a4d4193..0000000000 --- a/packages/addons/addon-depends/ffmpegx/patches/ffmpeg-04-lavc-libx265--unbreak-build-for-X265-BUILD---213.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 099f88b8641dfc299f3896d17d9addc5b9ae7799 Mon Sep 17 00:00:00 2001 -From: Gyan Doshi -Date: Sat, 5 Oct 2024 10:08:31 +0530 -Subject: [PATCH] avcodec/libx265: unbreak build for X265_BUILD >= 213 - -Earlier, x265 made an API change to support alpha and -other multiple layer pictures. We added guards to accommodate -that in 1f801dfdb5 - -They have now reverted that API change in -https://bitbucket.org/multicoreware/x265_git/commits/78e5b703b1 - -Updated our wrapper guards to unbreak build again. ---- - libavcodec/libx265.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c -index 513f4733079dd..63cc497f835f0 100644 ---- a/libavcodec/libx265.c -+++ b/libavcodec/libx265.c -@@ -661,7 +661,7 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt, - { - libx265Context *ctx = avctx->priv_data; - x265_picture x265pic; --#if X265_BUILD >= 210 -+#if (X265_BUILD >= 210) && (X265_BUILD < 213) - x265_picture x265pic_layers_out[MAX_SCALABLE_LAYERS]; - x265_picture* x265pic_lyrptr_out[MAX_SCALABLE_LAYERS]; - #else -@@ -805,7 +805,7 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt, - #endif - } - --#if X265_BUILD >= 210 -+#if (X265_BUILD >= 210) && (X265_BUILD < 213) - for (i = 0; i < MAX_SCALABLE_LAYERS; i++) - x265pic_lyrptr_out[i] = &x265pic_layers_out[i]; - -@@ -844,7 +844,7 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt, - pkt->flags |= AV_PKT_FLAG_KEY; - } - --#if X265_BUILD >= 210 -+#if (X265_BUILD >= 210) && (X265_BUILD < 213) - x265pic_out = x265pic_lyrptr_out[0]; - #else - x265pic_out = &x265pic_solo_out;