SHA256
1
0
forked from pool/ffmpeg-4

Accepting request 851368 from multimedia:libs

OBS-URL: https://build.opensuse.org/request/show/851368
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ffmpeg-4?expand=0&rev=35
This commit is contained in:
Dominique Leuenberger 2020-12-03 17:38:09 +00:00 committed by Git OBS Bridge
commit 96e1553ec5
3 changed files with 38 additions and 0 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Nov 27 15:03:17 UTC 2020 - Michel Normand <normand@linux.vnet.ibm.com>
- Add ffmpeg_altivec_yuv2rgb_novsx.patch for ppc64 (BE) as per
https://trac.ffmpeg.org/ticket/8750
https://bugzilla.opensuse.org/show_bug.cgi?id=1179332
-------------------------------------------------------------------
Mon Oct 19 06:42:32 UTC 2020 - Jan Engelhardt <jengelh@inai.de>

View File

@ -117,6 +117,7 @@ Patch5: soversion.patch
Patch6: ffmpeg.git-ba3e771a42c29ee02c34e7769cfc1b2dbc5c760a.patch
Patch7: 0001-lavf-srt-fix-build-fail-when-used-the-libsrt-1.4.1.patch
Patch8: vmaf-trim-usr-local.patch
Patch9: ffmpeg_altivec_yuv2rgb_novsx.patch
BuildRequires: ladspa-devel
BuildRequires: libgsm-devel
BuildRequires: libmp3lame-devel

View File

@ -0,0 +1,30 @@
From: Michel Normand <normand@linux.vnet.ibm.com>
Subject: ffmpeg altivec yuv2rgb novsx
Date: Fri, 27 Nov 2020 15:56:55 +0100
ffmpeg altivec yuv2rgb novsx
Retrieved from
https://trac.ffmpeg.org/ticket/8750#comment:7
diff --git a/libswscale/ppc/yuv2rgb_altivec.c b/libswscale/ppc/yuv2rgb_altivec.c
index 536545293d..930ef6b98f 100644
--- a/libswscale/ppc/yuv2rgb_altivec.c
+++ b/libswscale/ppc/yuv2rgb_altivec.c
@@ -283,6 +283,16 @@ static inline void cvtyuvtoRGB(SwsContext *c, vector signed short Y,
* ------------------------------------------------------------------------------
*/
+#if !HAVE_VSX
+static inline vector unsigned char vec_xl(signed long long offset, const ubyte *addr)
+{
+ const vector unsigned char *v_addr = (const vector unsigned char *) (addr + offset);
+ vector unsigned char align_perm = vec_lvsl(offset, addr);
+
+ return (vector unsigned char) vec_perm(v_addr[0], v_addr[1], align_perm);
+}
+#endif /* !HAVE_VSX */
+
#define DEFCSP420_CVT(name, out_pixels) \
static int altivec_ ## name(SwsContext *c, const unsigned char **in, \
int *instrides, int srcSliceY, int srcSliceH, \