From: Alexander Kanavin <[email protected]> Signed-off-by: Alexander Kanavin <[email protected]> --- ...b801191522961102d4bea292cdb61068d0dd.patch | 39 ------------------- meta/recipes-multimedia/x264/x264_git.bb | 5 +-- 2 files changed, 2 insertions(+), 42 deletions(-) delete mode 100644 meta/recipes-multimedia/x264/x264/32c3b801191522961102d4bea292cdb61068d0dd.patch
diff --git a/meta/recipes-multimedia/x264/x264/32c3b801191522961102d4bea292cdb61068d0dd.patch b/meta/recipes-multimedia/x264/x264/32c3b801191522961102d4bea292cdb61068d0dd.patch deleted file mode 100644 index fb0f313cdb..0000000000 --- a/meta/recipes-multimedia/x264/x264/32c3b801191522961102d4bea292cdb61068d0dd.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 32c3b801191522961102d4bea292cdb61068d0dd Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <[email protected]> -Date: Fri, 4 Apr 2025 16:59:34 +0300 -Subject: [PATCH] lavf: Update the code to work with the latest libavutil API - -Upstream-Status: Backport [https://code.videolan.org/videolan/x264/-/commit/32c3b801191522961102d4bea292cdb61068d0dd] ---- - input/lavf.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/input/lavf.c b/input/lavf.c -index 90f4cec5..e2489963 100644 ---- a/input/lavf.c -+++ b/input/lavf.c -@@ -33,6 +33,7 @@ - #include <libavutil/error.h> - #include <libavutil/mem.h> - #include <libavutil/pixdesc.h> -+#include <libavutil/version.h> - - #define FAIL_IF_ERROR( cond, ... ) FAIL_IF_ERR( cond, "lavf", __VA_ARGS__ ) - -@@ -141,8 +142,13 @@ static int read_frame_internal( cli_pic_t *p_pic, lavf_hnd_t *h, int i_frame, vi - if( info ) - { - info->fullrange = is_fullrange; -+#if LIBAVUTIL_VERSION_MAJOR < 60 - info->interlaced = h->frame->interlaced_frame; - info->tff = h->frame->top_field_first; -+#else -+ info->interlaced = !!(h->frame->flags & AV_FRAME_FLAG_INTERLACED); -+ info->tff = !!(h->frame->flags & AV_FRAME_FLAG_TOP_FIELD_FIRST); -+#endif - } - - if( h->vfr_input ) --- -GitLab - diff --git a/meta/recipes-multimedia/x264/x264_git.bb b/meta/recipes-multimedia/x264/x264_git.bb index eb72ba006a..b3d1cfd695 100644 --- a/meta/recipes-multimedia/x264/x264_git.bb +++ b/meta/recipes-multimedia/x264/x264_git.bb @@ -8,12 +8,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "nasm-native" -SRC_URI = "git://code.videolan.org/videolan/x264.git;branch=stable;protocol=https \ - file://32c3b801191522961102d4bea292cdb61068d0dd.patch \ +SRC_URI = "git://code.videolan.org/videolan/x264.git;branch=master;protocol=https \ " UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "31e19f92f00c7003fa115047ce50978bc98c3a0d" +SRCREV = "0480cb05fa188d37ae87e8f4fd8f1aea3711f7ee" PV = "r3039+git" -- 2.47.3
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#228435): https://lists.openembedded.org/g/openembedded-core/message/228435 Mute This Topic: https://lists.openembedded.org/mt/116907491/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
