diff options
| author | Matthieu Bouron <matthieu.bouron@stupeflix.com> | 2015-12-18 14:24:52 +0100 |
|---|---|---|
| committer | Matthieu Bouron <matthieu.bouron@stupeflix.com> | 2015-12-19 22:09:28 +0100 |
| commit | e0dc22b99e85823ea85a9da85eced1e9b2bf24e4 (patch) | |
| tree | 9716aaa0938028584d7ad20753a3609bc8cef938 | |
| parent | 2d2b41d1699646e824418fea6e6cb2a842654875 (diff) | |
| download | ffmpeg-e0dc22b99e85823ea85a9da85eced1e9b2bf24e4.tar.gz | |
swscale/arm/yuv2rgb: disable neon if accurate_rnd is enabled
This disables the 32bit precision neon code path in favor of the
default C one and avoids breaking fate.
| -rw-r--r-- | libswscale/arm/swscale_unscaled.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libswscale/arm/swscale_unscaled.c b/libswscale/arm/swscale_unscaled.c index e694ef4b26..4c121228ab 100644 --- a/libswscale/arm/swscale_unscaled.c +++ b/libswscale/arm/swscale_unscaled.c @@ -100,7 +100,6 @@ DECLARE_FF_NVX_TO_RGBX_FUNCS(nvx, bgra, precision) #define DECLARE_FF_NVX_TO_ALL_RGBX_ALL_PRECISION_FUNCS(nvx) \ DECLARE_FF_NVX_TO_ALL_RGBX_FUNCS(nvx, 16) \ -DECLARE_FF_NVX_TO_ALL_RGBX_FUNCS(nvx, 32) \ DECLARE_FF_NVX_TO_ALL_RGBX_ALL_PRECISION_FUNCS(nv12) DECLARE_FF_NVX_TO_ALL_RGBX_ALL_PRECISION_FUNCS(nv21) @@ -113,9 +112,9 @@ DECLARE_FF_NVX_TO_ALL_RGBX_ALL_PRECISION_FUNCS(nv21) if (c->srcFormat == AV_PIX_FMT_##IFMT \ && c->dstFormat == AV_PIX_FMT_##OFMT \ && !(c->srcH & 1) \ - && !(c->srcW & 15)) { \ - c->swscale = (accurate_rnd) ? ifmt##_to_##ofmt##_neon_wrapper_32 : \ - ifmt##_to_##ofmt##_neon_wrapper_16 ; \ + && !(c->srcW & 15) \ + && !accurate_rnd) { \ + c->swscale = ifmt##_to_##ofmt##_neon_wrapper_16; \ } \ } while (0) |