From b2eb8d3f79aeebaa700df208fe6b965e2c7fdc55 Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Wed, 20 Mar 2024 10:48:58 +0100 Subject: [PATCH] CI Linux FFmpeg: updated libde265 patch rebased with the current FFmpeg code --- .../master-0001-added-libde265-decoder.patch | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/scripts/Linux/ffmpeg-patches/master-0001-added-libde265-decoder.patch b/.github/scripts/Linux/ffmpeg-patches/master-0001-added-libde265-decoder.patch index c162e8ddd..fe55cf870 100644 --- a/.github/scripts/Linux/ffmpeg-patches/master-0001-added-libde265-decoder.patch +++ b/.github/scripts/Linux/ffmpeg-patches/master-0001-added-libde265-decoder.patch @@ -1,4 +1,4 @@ -From c8caab6ab8b4e4b622b03d05044206b1f56a94f7 Mon Sep 17 00:00:00 2001 +From 57e878ae0a763aae867a31457b1a5a4f4edb6b92 Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Thu, 25 Jan 2024 16:56:08 +0100 Subject: [PATCH] added libde265 decoder @@ -12,7 +12,7 @@ Subject: [PATCH] added libde265 decoder create mode 100644 libavcodec/libde265dec.c diff --git a/configure b/configure -index 21663000f8..b291a3d1eb 100755 +index e019d1b996..2621010a21 100755 --- a/configure +++ b/configure @@ -227,6 +227,7 @@ External library support: @@ -20,10 +20,10 @@ index 21663000f8..b291a3d1eb 100755 --enable-libdc1394 enable IIDC-1394 grabbing using libdc1394 and libraw1394 [no] + --enable-libde265 enable HEVC encoding via libde265 [no] + --enable-libdvdnav enable libdvdnav, needed for DVD demuxing [no] + --enable-libdvdread enable libdvdread, needed for DVD demuxing [no] --enable-libfdk-aac enable AAC de/encoding via libfdk-aac [no] - --enable-libflite enable flite (voice synthesis) support via libflite [no] - --enable-libfontconfig enable libfontconfig, useful for drawtext filter [no] -@@ -1857,6 +1858,7 @@ EXTERNAL_LIBRARY_LIST=" +@@ -1862,6 +1863,7 @@ EXTERNAL_LIBRARY_LIST=" libcodec2 libdav1d libdc1394 @@ -31,7 +31,7 @@ index 21663000f8..b291a3d1eb 100755 libflite libfontconfig libfreetype -@@ -3430,6 +3432,7 @@ libdav1d_decoder_deps="libdav1d" +@@ -3435,6 +3437,7 @@ libdav1d_decoder_deps="libdav1d" libdav1d_decoder_select="atsc_a53" libdavs2_decoder_deps="libdavs2" libdavs2_decoder_select="avs2_parser" @@ -39,19 +39,19 @@ index 21663000f8..b291a3d1eb 100755 libfdk_aac_decoder_deps="libfdk_aac" libfdk_aac_encoder_deps="libfdk_aac" libfdk_aac_encoder_select="audio_frame_queue" -@@ -6760,6 +6763,7 @@ enabled libcodec2 && require libcodec2 codec2/codec2.h codec2_create -lc +@@ -6771,6 +6774,7 @@ enabled libcodec2 && require libcodec2 codec2/codec2.h codec2_create -lc enabled libdav1d && require_pkg_config libdav1d "dav1d >= 0.5.0" "dav1d/dav1d.h" dav1d_version enabled libdavs2 && require_pkg_config libdavs2 "davs2 >= 1.6.0" davs2.h davs2_decoder_open enabled libdc1394 && require_pkg_config libdc1394 libdc1394-2 dc1394/dc1394.h dc1394_new +enabled libde265 && require_pkg_config libde265 "libde265 >= 1.0.0" libde265/de265.h de265_get_version enabled libdrm && check_pkg_config libdrm libdrm xf86drm.h drmGetVersion - enabled libfdk_aac && { check_pkg_config libfdk_aac fdk-aac "fdk-aac/aacenc_lib.h" aacEncOpen || - { require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac && + enabled libdvdnav && require_pkg_config libdvdnav "dvdnav >= 6.1.1" dvdnav/dvdnav.h dvdnav_open2 + enabled libdvdread && require_pkg_config libdvdread "dvdread >= 6.1.2" dvdread/dvd_reader.h DVDOpen2 diff --git a/libavcodec/Makefile b/libavcodec/Makefile -index 96361ac794..dabd5c7d1e 100644 +index 708434ac76..96c92c1204 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile -@@ -1114,6 +1114,7 @@ OBJS-$(CONFIG_LIBCODEC2_DECODER) += libcodec2.o +@@ -1112,6 +1112,7 @@ OBJS-$(CONFIG_LIBCODEC2_DECODER) += libcodec2.o OBJS-$(CONFIG_LIBCODEC2_ENCODER) += libcodec2.o OBJS-$(CONFIG_LIBDAV1D_DECODER) += libdav1d.o av1_parse.o OBJS-$(CONFIG_LIBDAVS2_DECODER) += libdavs2.o @@ -60,10 +60,10 @@ index 96361ac794..dabd5c7d1e 100644 OBJS-$(CONFIG_LIBFDK_AAC_ENCODER) += libfdk-aacenc.o OBJS-$(CONFIG_LIBGSM_DECODER) += libgsmdec.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c -index ef8c3a6d7d..28b6268e93 100644 +index 2386b450a6..c9362f3753 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c -@@ -776,6 +776,7 @@ extern const FFCodec ff_libcodec2_encoder; +@@ -766,6 +766,7 @@ extern const FFCodec ff_libcodec2_encoder; extern const FFCodec ff_libcodec2_decoder; extern const FFCodec ff_libdav1d_decoder; extern const FFCodec ff_libdavs2_decoder; @@ -851,5 +851,5 @@ index 0000000000..e5a18c4942 + AV_CODEC_CAP_SLICE_THREADS, +}; -- -2.43.0 +2.44.0