From b669ea5ea38898d8c0fef050af0ccd0ae82dc276 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Fri, 13 Dec 2024 21:32:21 +0100 Subject: [PATCH] ffmpeg: update libreelec patch Patch created using revisions b08d796..74d85ef from branch libreelec-misc-n7.1 of https://github.com/LibreELEC/FFmpeg --- .../libreelec/ffmpeg-001-libreelec.patch | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/multimedia/ffmpeg/patches/libreelec/ffmpeg-001-libreelec.patch b/packages/multimedia/ffmpeg/patches/libreelec/ffmpeg-001-libreelec.patch index 03b2742975..ba2c73b8a9 100644 --- a/packages/multimedia/ffmpeg/patches/libreelec/ffmpeg-001-libreelec.patch +++ b/packages/multimedia/ffmpeg/patches/libreelec/ffmpeg-001-libreelec.patch @@ -1,4 +1,4 @@ -From 2836d9b400c063b4332cdf6bb6f1a3719822eaed Mon Sep 17 00:00:00 2001 +From f3b90efacf67fb8e8ed07654a6c3f1bd807002a3 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Wed, 10 Apr 2019 13:39:21 -0700 Subject: [PATCH 1/2] libavcodec/libdav1d: add libdav1d_get_format method to @@ -18,10 +18,10 @@ decoding is properly activated. 1 file changed, 11 insertions(+) diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c -index 2488a709c7..48c8658a22 100644 +index 546b42e9c622..378231485900 100644 --- a/libavcodec/libdav1d.c +++ b/libavcodec/libdav1d.c -@@ -64,6 +64,16 @@ static const enum AVPixelFormat pix_fmt_rgb[3] = { +@@ -69,6 +69,16 @@ static const enum AVPixelFormat pix_fmt_rgb[3] = { AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRP10, AV_PIX_FMT_GBRP12, }; @@ -38,7 +38,7 @@ index 2488a709c7..48c8658a22 100644 static void libdav1d_log_callback(void *opaque, const char *fmt, va_list vl) { AVCodecContext *c = opaque; -@@ -424,6 +434,7 @@ FF_ENABLE_DEPRECATION_WARNINGS +@@ -424,6 +434,7 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame) if (res < 0) goto fail; @@ -47,7 +47,7 @@ index 2488a709c7..48c8658a22 100644 frame->height = p->p.h; if (c->width != p->p.w || c->height != p->p.h) { -From 19913e020c8760e8a760439a07bcb50273643324 Mon Sep 17 00:00:00 2001 +From 74d85efbbd5c9e92e7967d0a0200c41d8ce8a88e Mon Sep 17 00:00:00 2001 From: chewitt Date: Sun, 11 Aug 2019 07:08:19 +0000 Subject: [PATCH 2/2] add long-term yuv2rgb logging patch @@ -57,10 +57,10 @@ Subject: [PATCH 2/2] add long-term yuv2rgb logging patch 1 file changed, 4 deletions(-) diff --git a/libswscale/yuv2rgb.c b/libswscale/yuv2rgb.c -index 9c3f5e23c6..2a10527365 100644 +index 52fe2093e7b1..b04934071542 100644 --- a/libswscale/yuv2rgb.c +++ b/libswscale/yuv2rgb.c -@@ -690,10 +690,6 @@ SwsFunc ff_yuv2rgb_get_func_ptr(SwsContext *c) +@@ -573,10 +573,6 @@ SwsFunc ff_yuv2rgb_get_func_ptr(SwsContext *c) if (t) return t; @@ -68,6 +68,6 @@ index 9c3f5e23c6..2a10527365 100644 - "No accelerated colorspace conversion found from %s to %s.\n", - av_get_pix_fmt_name(c->srcFormat), av_get_pix_fmt_name(c->dstFormat)); - - switch (c->dstFormat) { - case AV_PIX_FMT_BGR48BE: - case AV_PIX_FMT_BGR48LE: + if (c->srcFormat == AV_PIX_FMT_YUV422P) { + switch (c->dstFormat) { + case AV_PIX_FMT_BGR48BE: