Skip to content

Commit 2ccefd5

Browse files
committed
CI Linux FFmpeg: updated libde265 patch
rebased with the current FFmpeg code
1 parent 7fa8a93 commit 2ccefd5

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From c8caab6ab8b4e4b622b03d05044206b1f56a94f7 Mon Sep 17 00:00:00 2001
1+
From 57e878ae0a763aae867a31457b1a5a4f4edb6b92 Mon Sep 17 00:00:00 2001
22
From: Martin Pulec <[email protected]>
33
Date: Thu, 25 Jan 2024 16:56:08 +0100
44
Subject: [PATCH] added libde265 decoder
@@ -12,46 +12,46 @@ Subject: [PATCH] added libde265 decoder
1212
create mode 100644 libavcodec/libde265dec.c
1313

1414
diff --git a/configure b/configure
15-
index 21663000f8..b291a3d1eb 100755
15+
index e019d1b996..2621010a21 100755
1616
--- a/configure
1717
+++ b/configure
1818
@@ -227,6 +227,7 @@ External library support:
1919
--enable-libdavs2 enable AVS2 decoding via libdavs2 [no]
2020
--enable-libdc1394 enable IIDC-1394 grabbing using libdc1394
2121
and libraw1394 [no]
2222
+ --enable-libde265 enable HEVC encoding via libde265 [no]
23+
--enable-libdvdnav enable libdvdnav, needed for DVD demuxing [no]
24+
--enable-libdvdread enable libdvdread, needed for DVD demuxing [no]
2325
--enable-libfdk-aac enable AAC de/encoding via libfdk-aac [no]
24-
--enable-libflite enable flite (voice synthesis) support via libflite [no]
25-
--enable-libfontconfig enable libfontconfig, useful for drawtext filter [no]
26-
@@ -1857,6 +1858,7 @@ EXTERNAL_LIBRARY_LIST="
26+
@@ -1862,6 +1863,7 @@ EXTERNAL_LIBRARY_LIST="
2727
libcodec2
2828
libdav1d
2929
libdc1394
3030
+ libde265
3131
libflite
3232
libfontconfig
3333
libfreetype
34-
@@ -3430,6 +3432,7 @@ libdav1d_decoder_deps="libdav1d"
34+
@@ -3435,6 +3437,7 @@ libdav1d_decoder_deps="libdav1d"
3535
libdav1d_decoder_select="atsc_a53"
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-
@@ -6760,6 +6763,7 @@ enabled libcodec2 && require libcodec2 codec2/codec2.h codec2_create -lc
42+
@@ -6771,6 +6774,7 @@ enabled libcodec2 && require libcodec2 codec2/codec2.h codec2_create -lc
4343
enabled libdav1d && require_pkg_config libdav1d "dav1d >= 0.5.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
48-
enabled libfdk_aac && { check_pkg_config libfdk_aac fdk-aac "fdk-aac/aacenc_lib.h" aacEncOpen ||
49-
{ require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac &&
48+
enabled libdvdnav && require_pkg_config libdvdnav "dvdnav >= 6.1.1" dvdnav/dvdnav.h dvdnav_open2
49+
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 96361ac794..dabd5c7d1e 100644
51+
index 708434ac76..96c92c1204 100644
5252
--- a/libavcodec/Makefile
5353
+++ b/libavcodec/Makefile
54-
@@ -1114,6 +1114,7 @@ OBJS-$(CONFIG_LIBCODEC2_DECODER) += libcodec2.o
54+
@@ -1112,6 +1112,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 96361ac794..dabd5c7d1e 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 ef8c3a6d7d..28b6268e93 100644
63+
index 2386b450a6..c9362f3753 100644
6464
--- a/libavcodec/allcodecs.c
6565
+++ b/libavcodec/allcodecs.c
66-
@@ -776,6 +776,7 @@ extern const FFCodec ff_libcodec2_encoder;
66+
@@ -766,6 +766,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;
@@ -851,5 +851,5 @@ index 0000000000..e5a18c4942
851851
+ AV_CODEC_CAP_SLICE_THREADS,
852852
+};
853853
--
854-
2.43.0
854+
2.44.0
855855

0 commit comments

Comments
 (0)