X-Git-Url: https://git.videolan.org/?p=ffmpeg.git;a=blobdiff_plain;f=libswscale%2Farm%2Fswscale_unscaled.c;h=4c121228abc9834c4873624e5798dbd3e11b0040;hp=e694ef4b26d1e10579ea01aab1700117d88fec63;hb=e0dc22b99e85823ea85a9da85eced1e9b2bf24e4;hpb=2d2b41d1699646e824418fea6e6cb2a842654875 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)