ffmpeg: update libreelec patch

Patch created using revisions dc91b91..635cf67
from branch 4.4-libreelec-misc of https://github.com/LibreELEC/FFmpeg
This commit is contained in:
CvH 2021-09-25 15:40:17 +02:00
parent 56d53bcfe1
commit 1f4fa5d080

View File

@ -1,4 +1,4 @@
From 823b70bfa0f451a0f8cd0539e1707f7bb7ff5891 Mon Sep 17 00:00:00 2001 From 8f7c8a0f9e28641880d72996b9452e0a9da1288c 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 bbb3ec1e6c..d8a7555c29 100644 index 3c2a68b7e0..68996426cc 100644
--- a/libavcodec/libdav1d.c --- a/libavcodec/libdav1d.c
+++ b/libavcodec/libdav1d.c +++ b/libavcodec/libdav1d.c
@@ -55,6 +55,16 @@ static const enum AVPixelFormat pix_fmt_rgb[3] = { @@ -58,6 +58,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,7 +38,7 @@ index bbb3ec1e6c..d8a7555c29 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;
@@ -259,6 +269,7 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame) @@ -264,6 +274,7 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame)
c->profile = p->seq_hdr->profile; c->profile = p->seq_hdr->profile;
c->level = ((p->seq_hdr->operating_points[0].major_level - 2) << 2) c->level = ((p->seq_hdr->operating_points[0].major_level - 2) << 2)
| p->seq_hdr->operating_points[0].minor_level; | p->seq_hdr->operating_points[0].minor_level;
@ -47,7 +47,7 @@ index bbb3ec1e6c..d8a7555c29 100644
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 1485078472d107806d1d3f52f89e3ff47ae8715c Mon Sep 17 00:00:00 2001 From 635cf67be3d37159c96e75f00399b3e232372251 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 588462504e..20364ff318 100644 index 6a3956e8e2..d6f9aea166 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)