diff options
| author | Carl Eugen Hoyos <ceffmpeg@gmail.com> | 2017-10-29 01:40:18 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <ceffmpeg@gmail.com> | 2017-10-29 14:53:57 +0100 |
| commit | 9b0510a8e35930a22790518270ee6d3fad9f1666 (patch) | |
| tree | 918c04513fb3e871b9537f118fd24c1d08333b0e /libswscale | |
| parent | c8e8092543ddd09b5e5e69cde13d6f054edc69ab (diff) | |
lsws/yuv2rgb: Fix yuva2rgb32 on big endian hardware.
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/version.h | 2 | ||||
| -rw-r--r-- | libswscale/yuv2rgb.c | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/libswscale/version.h b/libswscale/version.h index 9c24122031..0393a6fe4a 100644 --- a/libswscale/version.h +++ b/libswscale/version.h @@ -28,7 +28,7 @@ #define LIBSWSCALE_VERSION_MAJOR 5 #define LIBSWSCALE_VERSION_MINOR 0 -#define LIBSWSCALE_VERSION_MICRO 100 +#define LIBSWSCALE_VERSION_MICRO 101 #define LIBSWSCALE_VERSION_INT AV_VERSION_INT(LIBSWSCALE_VERSION_MAJOR, \ LIBSWSCALE_VERSION_MINOR, \ diff --git a/libswscale/yuv2rgb.c b/libswscale/yuv2rgb.c index 1fe5abed9c..737cbb06c8 100644 --- a/libswscale/yuv2rgb.c +++ b/libswscale/yuv2rgb.c @@ -267,7 +267,11 @@ ENDYUV2RGBLINE(8, 1) PUTRGB(dst_2, py_2, 0); ENDYUV2RGBFUNC() +#if HAVE_BIGENDIAN +YUV2RGBFUNC(yuva2argb_c, uint32_t, 1) +#else YUV2RGBFUNC(yuva2rgba_c, uint32_t, 1) +#endif LOADCHROMA(0); PUTRGBA(dst_1, py_1, pa_1, 0, 24); PUTRGBA(dst_2, py_2, pa_2, 0, 24); @@ -301,7 +305,11 @@ ENDYUV2RGBLINE(8, 1) PUTRGBA(dst_2, py_2, pa_2, 0, 24); ENDYUV2RGBFUNC() +#if HAVE_BIGENDIAN +YUV2RGBFUNC(yuva2rgba_c, uint32_t, 1) +#else YUV2RGBFUNC(yuva2argb_c, uint32_t, 1) +#endif LOADCHROMA(0); PUTRGBA(dst_1, py_1, pa_1, 0, 0); PUTRGBA(dst_2, py_2, pa_2, 0, 0); |