d6312941d6
Add a patch to fix build without ssse3.
Update the license hash due to various changes since August 2019 [0]:
- some files were relicensed from GPL-2.0+ to LGPL-2.1+; no impact on
the licensing information;
- clarification about the licensing when linked with external
libraries, which now requires passing --enable-version3; Buildroot
is not concerned, because it passes --disable-version3;
- various clarification about applicable licensing terms.
[0] http://git.videolan.org/?p=ffmpeg.git;a=history;f=LICENSE.md;h=613070e1b631a919a74c862f2a75a0f249a631ff;hb=8e12af29d1a3f95c9e952d78354e3c8b1c0431a8
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
[yann.morin.1998@free.fr:
- fix the SoB order in the patch
- clarify the impact of the licensing changes
]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
44 lines
1.4 KiB
Diff
44 lines
1.4 KiB
Diff
From bf8eae2d30a205bb76ac625e04c0351106981b9e Mon Sep 17 00:00:00 2001
|
|
From: Parker Ernest <@>
|
|
Date: Sun, 23 Feb 2020 13:22:42 +0100
|
|
Subject: [PATCH] swscale/x86/yuv2rgb: Fix build without SSSE3
|
|
|
|
commit fc6a5883d6af8cae0e96af84dda0ad74b360a084 breaks build on
|
|
x86_64 CPUs which do not have SSSE3, e.g. AMD Phenom-II
|
|
|
|
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
|
|
[bernd.kuhls@t-online.de:
|
|
- retrieved from upstream patchwork:
|
|
https://patchwork.ffmpeg.org/project/ffmpeg/patch/20200223122256.23402-1-michael@niedermayer.cc/
|
|
]
|
|
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
|
[yann.morin.1998@free.fr: fix reference top patchwork and SoB order]
|
|
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
|
|
---
|
|
libswscale/x86/yuv2rgb.c | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/libswscale/x86/yuv2rgb.c b/libswscale/x86/yuv2rgb.c
|
|
index c12e88cbb5..4791e5b93a 100644
|
|
--- a/libswscale/x86/yuv2rgb.c
|
|
+++ b/libswscale/x86/yuv2rgb.c
|
|
@@ -83,6 +83,7 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c)
|
|
#if HAVE_X86ASM
|
|
int cpu_flags = av_get_cpu_flags();
|
|
|
|
+#if HAVE_SSSE3
|
|
if (EXTERNAL_SSSE3(cpu_flags)) {
|
|
switch (c->dstFormat) {
|
|
case AV_PIX_FMT_RGB32:
|
|
@@ -111,6 +112,7 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c)
|
|
return yuv420_rgb15_ssse3;
|
|
}
|
|
}
|
|
+#endif
|
|
|
|
if (EXTERNAL_MMXEXT(cpu_flags)) {
|
|
switch (c->dstFormat) {
|
|
--
|
|
2.26.2
|
|
|