mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 13:46:49 +00:00
ffmpeg: update libreelec patch
Patch created using revisions b08d796..74d85ef from branch libreelec-misc-n7.1 of https://github.com/LibreELEC/FFmpeg
This commit is contained in:
parent
086fa80a78
commit
b669ea5ea3
@ -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 <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 2488a709c7..48c8658a22 100644
|
index 546b42e9c622..378231485900 100644
|
||||||
--- a/libavcodec/libdav1d.c
|
--- a/libavcodec/libdav1d.c
|
||||||
+++ b/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,
|
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)
|
static void libdav1d_log_callback(void *opaque, const char *fmt, va_list vl)
|
||||||
{
|
{
|
||||||
AVCodecContext *c = opaque;
|
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)
|
if (res < 0)
|
||||||
goto fail;
|
goto fail;
|
||||||
|
|
||||||
@ -47,7 +47,7 @@ index 2488a709c7..48c8658a22 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 19913e020c8760e8a760439a07bcb50273643324 Mon Sep 17 00:00:00 2001
|
From 74d85efbbd5c9e92e7967d0a0200c41d8ce8a88e 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,10 +57,10 @@ 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 9c3f5e23c6..2a10527365 100644
|
index 52fe2093e7b1..b04934071542 100644
|
||||||
--- a/libswscale/yuv2rgb.c
|
--- a/libswscale/yuv2rgb.c
|
||||||
+++ b/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)
|
if (t)
|
||||||
return t;
|
return t;
|
||||||
|
|
||||||
@ -68,6 +68,6 @@ index 9c3f5e23c6..2a10527365 100644
|
|||||||
- "No accelerated colorspace conversion found from %s to %s.\n",
|
- "No accelerated colorspace conversion found from %s to %s.\n",
|
||||||
- av_get_pix_fmt_name(c->srcFormat), av_get_pix_fmt_name(c->dstFormat));
|
- av_get_pix_fmt_name(c->srcFormat), av_get_pix_fmt_name(c->dstFormat));
|
||||||
-
|
-
|
||||||
switch (c->dstFormat) {
|
if (c->srcFormat == AV_PIX_FMT_YUV422P) {
|
||||||
case AV_PIX_FMT_BGR48BE:
|
switch (c->dstFormat) {
|
||||||
case AV_PIX_FMT_BGR48LE:
|
case AV_PIX_FMT_BGR48BE:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user