ffmpeg: update libreelec patch

Patch created using revisions ea3d24b..19913e0
from branch 6.0-libreelec-misc of https://github.com/LibreELEC/FFmpeg
This commit is contained in:
Matthias Reichl 2023-04-01 17:46:50 +02:00
parent 5c23848068
commit fb74df62de

View File

@ -1,4 +1,4 @@
From 3c53cf80b0de8af387694a464bdce294988d0fa5 Mon Sep 17 00:00:00 2001
From 2836d9b400c063b4332cdf6bb6f1a3719822eaed Mon Sep 17 00:00:00 2001
From: Lukas Rusak <lorusak@gmail.com>
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 0a46cf2264..1f4e708bcf 100644
index 2488a709c7..48c8658a22 100644
--- a/libavcodec/libdav1d.c
+++ b/libavcodec/libdav1d.c
@@ -66,6 +66,16 @@ static const enum AVPixelFormat pix_fmt_rgb[3] = {
@@ -64,6 +64,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 0a46cf2264..1f4e708bcf 100644
static void libdav1d_log_callback(void *opaque, const char *fmt, va_list vl)
{
AVCodecContext *c = opaque;
@@ -390,6 +400,7 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame)
@@ -424,6 +434,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
if (res < 0)
goto fail;
@ -47,7 +47,7 @@ index 0a46cf2264..1f4e708bcf 100644
frame->height = p->p.h;
if (c->width != p->p.w || c->height != p->p.h) {
From 3af25a2cae2ad3152e2969eefd9f13c9bb183969 Mon Sep 17 00:00:00 2001
From 19913e020c8760e8a760439a07bcb50273643324 Mon Sep 17 00:00:00 2001
From: chewitt <github@chrishewitt.net>
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 6ee483d12a..c22161741b 100644
index 9c3f5e23c6..2a10527365 100644
--- a/libswscale/yuv2rgb.c
+++ b/libswscale/yuv2rgb.c
@@ -688,10 +688,6 @@ SwsFunc ff_yuv2rgb_get_func_ptr(SwsContext *c)
@@ -690,10 +690,6 @@ SwsFunc ff_yuv2rgb_get_func_ptr(SwsContext *c)
if (t)
return t;