fa36a6375d
Quoting Changelog: http://git.videolan.org/?p=ffmpeg.git;a=blob;f=Changelog;h=b357f428abce2110904944c4cc066b8e297bb895;hb=3153c441e1d980ff9931ed26a0e01b4e366ac521 "- ffmpeg now requires threading to be built" Propagate threads to reserve dependencies. Rebased patches. Removed patch 0005 which is included in this release. Removed support for libavresample which was removed upstream. No legacy handling necessary for opencv3/4 because libavresample was an optional dependency. Added upstream patch 0005 to fix build error with arm. Drop configure options which were removed upstream. Signed-off-by: Bernd Kuhls <bernd@kuhls.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
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
|
|
@@ -70,6 +70,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:
|
|
@@ -98,6 +99,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
|
|
|