Skip to content

Commit 762a2c2

Browse files
committed
CI Linux FFmpeg: update libde265 patch
the original version no longer applied so the UG/FFmpeg build failed
1 parent 36f7e67 commit 762a2c2

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

.github/scripts/Linux/ffmpeg-patches/master-0001-added-libde265-decoder.patch renamed to .github/scripts/Linux/ffmpeg-patches/0001-added-libde265-decoder.patch

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
From 52d1e387fa28437a2406baedbd862cef2abd3021 Mon Sep 17 00:00:00 2001
1+
From 50cc66377563962768743de0a8108b250c594772 Mon Sep 17 00:00:00 2001
22
From: Martin Pulec <[email protected]>
3-
Date: Wed, 16 Oct 2024 09:43:16 +0200
3+
Date: Fri, 3 Oct 2025 15:11:38 +0200
44
Subject: [PATCH] added libde265 decoder
55

66
---
@@ -12,7 +12,7 @@ Subject: [PATCH] added libde265 decoder
1212
create mode 100644 libavcodec/libde265dec.c
1313

1414
diff --git a/configure b/configure
15-
index f89e9425da..0691d33a9f 100755
15+
index 399b1ce128..f71df152fc 100755
1616
--- a/configure
1717
+++ b/configure
1818
@@ -228,6 +228,7 @@ External library support:
@@ -23,35 +23,35 @@ index f89e9425da..0691d33a9f 100755
2323
--enable-libdvdnav enable libdvdnav, needed for DVD demuxing [no]
2424
--enable-libdvdread enable libdvdread, needed for DVD demuxing [no]
2525
--enable-libfdk-aac enable AAC de/encoding via libfdk-aac [no]
26-
@@ -1921,6 +1922,7 @@ EXTERNAL_LIBRARY_LIST="
26+
@@ -1967,6 +1968,7 @@ EXTERNAL_LIBRARY_LIST="
2727
libcodec2
2828
libdav1d
2929
libdc1394
3030
+ libde265
3131
libflite
3232
libfontconfig
3333
libfreetype
34-
@@ -3543,6 +3545,7 @@ libdav1d_decoder_deps="libdav1d"
34+
@@ -3654,6 +3656,7 @@ libdav1d_decoder_deps="libdav1d"
3535
libdav1d_decoder_select="atsc_a53 dovi_rpudec"
3636
libdavs2_decoder_deps="libdavs2"
3737
libdavs2_decoder_select="avs2_parser"
3838
+libde265_decoder_deps="libde265"
3939
libfdk_aac_decoder_deps="libfdk_aac"
4040
libfdk_aac_encoder_deps="libfdk_aac"
4141
libfdk_aac_encoder_select="audio_frame_queue"
42-
@@ -6905,6 +6908,7 @@ enabled libcodec2 && require libcodec2 codec2/codec2.h codec2_create -lc
43-
enabled libdav1d && require_pkg_config libdav1d "dav1d >= 0.5.0" "dav1d/dav1d.h" dav1d_version
42+
@@ -7119,6 +7122,7 @@ enabled libcodec2 && require libcodec2 codec2/codec2.h codec2_create -lc
43+
enabled libdav1d && require_pkg_config libdav1d "dav1d >= 1.0.0" "dav1d/dav1d.h" dav1d_version
4444
enabled libdavs2 && require_pkg_config libdavs2 "davs2 >= 1.6.0" davs2.h davs2_decoder_open
4545
enabled libdc1394 && require_pkg_config libdc1394 libdc1394-2 dc1394/dc1394.h dc1394_new
4646
+enabled libde265 && require_pkg_config libde265 "libde265 >= 1.0.0" libde265/de265.h de265_get_version
4747
enabled libdrm && check_pkg_config libdrm libdrm xf86drm.h drmGetVersion
4848
enabled libdvdnav && require_pkg_config libdvdnav "dvdnav >= 6.1.1" dvdnav/dvdnav.h dvdnav_open2
4949
enabled libdvdread && require_pkg_config libdvdread "dvdread >= 6.1.2" dvdread/dvd_reader.h DVDOpen2
5050
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
51-
index 270f39d5b3..d0aa9bed98 100644
51+
index e7fde87b22..d9aabb51e5 100644
5252
--- a/libavcodec/Makefile
5353
+++ b/libavcodec/Makefile
54-
@@ -1124,6 +1124,7 @@ OBJS-$(CONFIG_LIBCODEC2_DECODER) += libcodec2.o
54+
@@ -1166,6 +1166,7 @@ OBJS-$(CONFIG_LIBCODEC2_DECODER) += libcodec2.o
5555
OBJS-$(CONFIG_LIBCODEC2_ENCODER) += libcodec2.o
5656
OBJS-$(CONFIG_LIBDAV1D_DECODER) += libdav1d.o av1_parse.o
5757
OBJS-$(CONFIG_LIBDAVS2_DECODER) += libdavs2.o
@@ -60,10 +60,10 @@ index 270f39d5b3..d0aa9bed98 100644
6060
OBJS-$(CONFIG_LIBFDK_AAC_ENCODER) += libfdk-aacenc.o
6161
OBJS-$(CONFIG_LIBGSM_DECODER) += libgsmdec.o
6262
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
63-
index c7e5f9910c..4c7a3b53f5 100644
63+
index d4b360f289..cfd14d28c3 100644
6464
--- a/libavcodec/allcodecs.c
6565
+++ b/libavcodec/allcodecs.c
66-
@@ -767,6 +767,7 @@ extern const FFCodec ff_libcodec2_encoder;
66+
@@ -784,6 +784,7 @@ extern const FFCodec ff_libcodec2_encoder;
6767
extern const FFCodec ff_libcodec2_decoder;
6868
extern const FFCodec ff_libdav1d_decoder;
6969
extern const FFCodec ff_libdavs2_decoder;
@@ -844,5 +844,5 @@ index 0000000000..81c8894a52
844844
+ AV_CODEC_CAP_SLICE_THREADS,
845845
+};
846846
--
847-
2.47.0
847+
2.51.0
848848

0 commit comments

Comments
 (0)