mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-09-30 14:01:57 -09:00
package/ffmpeg: bump version to 4.4.4
Changelog:
https://git.videolan.org/?p=ffmpeg.git;a=blob;f=Changelog;hb=refs/heads/release/4.4
Rebased all patches, switched _SITE to https.
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 72edd5633e)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
committed by
Peter Korsgaard
parent
13cf1ba623
commit
1c15acd6bc
@@ -22,7 +22,7 @@ diff --git a/libswscale/x86/yuv2rgb.c b/libswscale/x86/yuv2rgb.c
|
|||||||
index c12e88cbb5..4791e5b93a 100644
|
index c12e88cbb5..4791e5b93a 100644
|
||||||
--- a/libswscale/x86/yuv2rgb.c
|
--- a/libswscale/x86/yuv2rgb.c
|
||||||
+++ b/libswscale/x86/yuv2rgb.c
|
+++ b/libswscale/x86/yuv2rgb.c
|
||||||
@@ -83,6 +83,7 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c)
|
@@ -71,6 +71,7 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c)
|
||||||
#if HAVE_X86ASM
|
#if HAVE_X86ASM
|
||||||
int cpu_flags = av_get_cpu_flags();
|
int cpu_flags = av_get_cpu_flags();
|
||||||
|
|
||||||
@@ -30,7 +30,7 @@ index c12e88cbb5..4791e5b93a 100644
|
|||||||
if (EXTERNAL_SSSE3(cpu_flags)) {
|
if (EXTERNAL_SSSE3(cpu_flags)) {
|
||||||
switch (c->dstFormat) {
|
switch (c->dstFormat) {
|
||||||
case AV_PIX_FMT_RGB32:
|
case AV_PIX_FMT_RGB32:
|
||||||
@@ -111,6 +112,7 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c)
|
@@ -99,6 +100,7 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c)
|
||||||
return yuv420_rgb15_ssse3;
|
return yuv420_rgb15_ssse3;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ diff --git a/configure b/configure
|
|||||||
index 6bfd98b384..773a7d516c 100755
|
index 6bfd98b384..773a7d516c 100755
|
||||||
--- a/configure
|
--- a/configure
|
||||||
+++ b/configure
|
+++ b/configure
|
||||||
@@ -2161,6 +2161,7 @@ HEADERS_LIST="
|
@@ -2135,6 +2135,7 @@ HEADERS_LIST="
|
||||||
opencv2_core_core_c_h
|
opencv2_core_core_c_h
|
||||||
OpenGL_gl3_h
|
OpenGL_gl3_h
|
||||||
poll_h
|
poll_h
|
||||||
@@ -28,7 +28,7 @@ index 6bfd98b384..773a7d516c 100755
|
|||||||
sys_param_h
|
sys_param_h
|
||||||
sys_resource_h
|
sys_resource_h
|
||||||
sys_select_h
|
sys_select_h
|
||||||
@@ -6218,6 +6219,7 @@ check_func_headers VideoToolbox/VTCompressionSession.h VTCompressionSessionPrepa
|
@@ -6182,6 +6183,7 @@ check_func_headers VideoToolbox/VTCompressionSession.h VTCompressionSessionPrepa
|
||||||
check_headers windows.h
|
check_headers windows.h
|
||||||
check_headers X11/extensions/XvMClib.h
|
check_headers X11/extensions/XvMClib.h
|
||||||
check_headers asm/types.h
|
check_headers asm/types.h
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ diff --git a/configure b/configure
|
|||||||
index 0bb3a7cf2b..3bda99e415 100755
|
index 0bb3a7cf2b..3bda99e415 100755
|
||||||
--- a/configure
|
--- a/configure
|
||||||
+++ b/configure
|
+++ b/configure
|
||||||
@@ -7602,15 +7602,15 @@ rpath=$(enabled rpath && echo "-Wl,-rpath,\${libdir}")
|
@@ -7715,15 +7715,15 @@ rpath=$(enabled rpath && echo "-Wl,-rpath,\${libdir}")
|
||||||
source_path=${source_path}
|
source_path=${source_path}
|
||||||
LIBPREF=${LIBPREF}
|
LIBPREF=${LIBPREF}
|
||||||
LIBSUF=${LIBSUF}
|
LIBSUF=${LIBSUF}
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ menuconfig BR2_PACKAGE_FFMPEG
|
|||||||
FFmpeg is a complete, cross-platform solution to record,
|
FFmpeg is a complete, cross-platform solution to record,
|
||||||
convert and stream audio and video.
|
convert and stream audio and video.
|
||||||
|
|
||||||
http://www.ffmpeg.org
|
https://www.ffmpeg.org
|
||||||
|
|
||||||
if BR2_PACKAGE_FFMPEG
|
if BR2_PACKAGE_FFMPEG
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
# Locally calculated
|
# Locally calculated
|
||||||
sha256 6c5b6c195e61534766a0b5fe16acc919170c883362612816d0a1c7f4f947006e ffmpeg-4.4.3.tar.xz
|
sha256 e80b380d595c809060f66f96a5d849511ef4a76a26b76eacf5778b94c3570309 ffmpeg-4.4.4.tar.xz
|
||||||
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPLv2
|
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING.GPLv2
|
||||||
sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe COPYING.LGPLv2.1
|
sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe COPYING.LGPLv2.1
|
||||||
sha256 cb48bf09a11f5fb576cddb0431c8f5ed0a60157a9ec942adffc13907cbe083f2 LICENSE.md
|
sha256 cb48bf09a11f5fb576cddb0431c8f5ed0a60157a9ec942adffc13907cbe083f2 LICENSE.md
|
||||||
|
|||||||
@@ -4,9 +4,9 @@
|
|||||||
#
|
#
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
FFMPEG_VERSION = 4.4.3
|
FFMPEG_VERSION = 4.4.4
|
||||||
FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz
|
FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz
|
||||||
FFMPEG_SITE = http://ffmpeg.org/releases
|
FFMPEG_SITE = https://ffmpeg.org/releases
|
||||||
FFMPEG_INSTALL_STAGING = YES
|
FFMPEG_INSTALL_STAGING = YES
|
||||||
|
|
||||||
FFMPEG_LICENSE = LGPL-2.1+, libjpeg license
|
FFMPEG_LICENSE = LGPL-2.1+, libjpeg license
|
||||||
|
|||||||
Reference in New Issue
Block a user