ffmpeg: update libreelec patch

Patch created using revisions eacfcba..3af25a2
from branch 5.1.2-libreelec-misc of https://github.com/LibreELEC/FFmpeg
This commit is contained in:
Matthias Reichl 2022-10-21 16:27:14 +02:00
parent 97a690410f
commit f887a67518

View File

@ -1,4 +1,4 @@
From 8f7c8a0f9e28641880d72996b9452e0a9da1288c Mon Sep 17 00:00:00 2001 From 3c53cf80b0de8af387694a464bdce294988d0fa5 Mon Sep 17 00:00:00 2001
From: Lukas Rusak <lorusak@gmail.com> From: Lukas Rusak <lorusak@gmail.com>
Date: Wed, 10 Apr 2019 13:39:21 -0700 Date: Wed, 10 Apr 2019 13:39:21 -0700
Subject: [PATCH 1/2] libavcodec/libdav1d: add libdav1d_get_format method to 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(+) 1 file changed, 11 insertions(+)
diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c
index 3c2a68b7e0..68996426cc 100644 index 0a46cf2264..1f4e708bcf 100644
--- a/libavcodec/libdav1d.c --- a/libavcodec/libdav1d.c
+++ b/libavcodec/libdav1d.c +++ b/libavcodec/libdav1d.c
@@ -58,6 +58,16 @@ static const enum AVPixelFormat pix_fmt_rgb[3] = { @@ -66,6 +66,16 @@ static const enum AVPixelFormat pix_fmt_rgb[3] = {
AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRP10, AV_PIX_FMT_GBRP12, AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRP10, AV_PIX_FMT_GBRP12,
}; };
@ -38,16 +38,16 @@ index 3c2a68b7e0..68996426cc 100644
static void libdav1d_log_callback(void *opaque, const char *fmt, va_list vl) static void libdav1d_log_callback(void *opaque, const char *fmt, va_list vl)
{ {
AVCodecContext *c = opaque; AVCodecContext *c = opaque;
@@ -264,6 +274,7 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame) @@ -390,6 +400,7 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame)
c->profile = p->seq_hdr->profile; if (res < 0)
c->level = ((p->seq_hdr->operating_points[0].major_level - 2) << 2) goto fail;
| p->seq_hdr->operating_points[0].minor_level;
+ frame->format = c->pix_fmt = libdav1d_get_format(c, p); + frame->format = c->pix_fmt = libdav1d_get_format(c, p);
frame->width = p->p.w; frame->width = p->p.w;
frame->height = p->p.h; frame->height = p->p.h;
if (c->width != p->p.w || c->height != p->p.h) { if (c->width != p->p.w || c->height != p->p.h) {
From 635cf67be3d37159c96e75f00399b3e232372251 Mon Sep 17 00:00:00 2001 From 3af25a2cae2ad3152e2969eefd9f13c9bb183969 Mon Sep 17 00:00:00 2001
From: chewitt <github@chrishewitt.net> From: chewitt <github@chrishewitt.net>
Date: Sun, 11 Aug 2019 07:08:19 +0000 Date: Sun, 11 Aug 2019 07:08:19 +0000
Subject: [PATCH 2/2] add long-term yuv2rgb logging patch Subject: [PATCH 2/2] add long-term yuv2rgb logging patch
@ -57,7 +57,7 @@ Subject: [PATCH 2/2] add long-term yuv2rgb logging patch
1 file changed, 4 deletions(-) 1 file changed, 4 deletions(-)
diff --git a/libswscale/yuv2rgb.c b/libswscale/yuv2rgb.c diff --git a/libswscale/yuv2rgb.c b/libswscale/yuv2rgb.c
index 6a3956e8e2..d6f9aea166 100644 index 6ee483d12a..c22161741b 100644
--- a/libswscale/yuv2rgb.c --- a/libswscale/yuv2rgb.c
+++ b/libswscale/yuv2rgb.c +++ b/libswscale/yuv2rgb.c
@@ -688,10 +688,6 @@ SwsFunc ff_yuv2rgb_get_func_ptr(SwsContext *c) @@ -688,10 +688,6 @@ SwsFunc ff_yuv2rgb_get_func_ptr(SwsContext *c)