Skip to content

Commit 14b0c24

Browse files
authored
Merge pull request #11127 from HiassofT/le13-ffmpeg-8.1
ffmpeg: update to 8.1
2 parents fae14f6 + 9ef6c9c commit 14b0c24

8 files changed

Lines changed: 565 additions & 448 deletions

File tree

packages/multimedia/ffmpeg/package.mk

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
44

55
PKG_NAME="ffmpeg"
6-
PKG_VERSION="8.0.1"
7-
PKG_SHA256="05ee0b03119b45c0bdb4df654b96802e909e0a752f72e4fe3794f487229e5a41"
6+
PKG_VERSION="8.1"
7+
PKG_SHA256="b072aed6871998cce9b36e7774033105ca29e33632be5b6347f3206898e0756a"
88
PKG_LICENSE="GPL-3.0-only"
99
PKG_SITE="https://ffmpeg.org"
1010
PKG_URL="http://ffmpeg.org/releases/ffmpeg-${PKG_VERSION}.tar.xz"
@@ -17,9 +17,9 @@ PKG_FFMPEG_REQUEST_ENABLE="--enable-libudev --enable-v4l2-request"
1717

1818
case "${PROJECT}" in
1919
Amlogic)
20-
PKG_VERSION="3abbcb6a1f8a70921543ceb6b4d573df97223cd9"
21-
PKG_FFMPEG_BRANCH="test/8.0.1/main"
22-
PKG_SHA256="91b9fa499919ff2b8db8046202279188ad0f7798638798ddbbb6d279ff2db820"
20+
PKG_VERSION="272ffca8790f4a333d06d5ad0a7c503709f1735f"
21+
PKG_FFMPEG_BRANCH="dev/8.1/rpi_import_1"
22+
PKG_SHA256="bfc17be4447905694e5d1deefe5f57d316e39876aa1419835d43bc24d1c254f1"
2323
PKG_URL="https://github.com/jc-kynesim/rpi-ffmpeg/archive/${PKG_VERSION}.tar.gz"
2424
;;
2525
Generic)

packages/multimedia/ffmpeg/patches/libreelec/ffmpeg-001-libreelec.patch

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 8593c2111e9aae5519385ac6b0b8bd15090443ff Mon Sep 17 00:00:00 2001
1+
From 52357d3fed66db8982066298e6df1fce6275bf9b Mon Sep 17 00:00:00 2001
22
From: Lukas Rusak <lorusak@gmail.com>
33
Date: Wed, 10 Apr 2019 13:39:21 -0700
44
Subject: [PATCH 1/2] libavcodec/libdav1d: add libdav1d_get_format method to
@@ -18,10 +18,10 @@ decoding is properly activated.
1818
1 file changed, 11 insertions(+)
1919

2020
diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c
21-
index a1158a23c4f1..ee16116874c9 100644
21+
index 14ec9842a0c5..1ff7b626c7ca 100644
2222
--- a/libavcodec/libdav1d.c
2323
+++ b/libavcodec/libdav1d.c
24-
@@ -69,6 +69,16 @@ static const enum AVPixelFormat pix_fmt_rgb[3] = {
24+
@@ -67,6 +67,16 @@ static const enum AVPixelFormat pix_fmt_rgb[3] = {
2525
AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRP10, AV_PIX_FMT_GBRP12,
2626
};
2727

@@ -38,7 +38,7 @@ index a1158a23c4f1..ee16116874c9 100644
3838
static void libdav1d_log_callback(void *opaque, const char *fmt, va_list vl)
3939
{
4040
AVCodecContext *c = opaque;
41-
@@ -503,6 +513,7 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame)
41+
@@ -474,6 +484,7 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame)
4242
if (res < 0)
4343
goto fail;
4444

@@ -47,7 +47,7 @@ index a1158a23c4f1..ee16116874c9 100644
4747
frame->height = p->p.h;
4848
if (c->width != p->p.w || c->height != p->p.h) {
4949

50-
From 30005e20129498580b969d2d3a6fef81c1fa3472 Mon Sep 17 00:00:00 2001
50+
From d02228e053ef07aa4f9e6ac12312b5b5d1dff030 Mon Sep 17 00:00:00 2001
5151
From: chewitt <github@chrishewitt.net>
5252
Date: Sun, 11 Aug 2019 07:08:19 +0000
5353
Subject: [PATCH 2/2] add long-term yuv2rgb logging patch
@@ -57,10 +57,10 @@ Subject: [PATCH 2/2] add long-term yuv2rgb logging patch
5757
1 file changed, 4 deletions(-)
5858

5959
diff --git a/libswscale/yuv2rgb.c b/libswscale/yuv2rgb.c
60-
index ff8e013da4d1..ee3b3e35114a 100644
60+
index c62201856d19..a3d31b355a93 100644
6161
--- a/libswscale/yuv2rgb.c
6262
+++ b/libswscale/yuv2rgb.c
63-
@@ -573,10 +573,6 @@ SwsFunc ff_yuv2rgb_get_func_ptr(SwsInternal *c)
63+
@@ -575,10 +575,6 @@ SwsFunc ff_yuv2rgb_get_func_ptr(SwsInternal *c)
6464
if (t)
6565
return t;
6666

0 commit comments

Comments
 (0)