From 4ec0a95484eebe2b86ce305024a705d01a89f355 Mon Sep 17 00:00:00 2001 From: Martin Vignali Date: Tue, 20 Mar 2018 21:04:32 +0100 Subject: [PATCH 4/4] swscale/rgb2rgb : cosmetic, move shuffle_bytes func declaration move shuffle_bytes_1230, 3012, 3210 with the other shuffle_byte declaration --- libswscale/rgb2rgb.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libswscale/rgb2rgb.h b/libswscale/rgb2rgb.h index 08de546598..3569254df9 100644 --- a/libswscale/rgb2rgb.h +++ b/libswscale/rgb2rgb.h @@ -52,6 +52,9 @@ extern void (*rgb32tobgr15)(const uint8_t *src, uint8_t *dst, int src_size); extern void (*shuffle_bytes_0321)(const uint8_t *src, uint8_t *dst, int src_size); extern void (*shuffle_bytes_2103)(const uint8_t *src, uint8_t *dst, int src_size); +extern void (*shuffle_bytes_1230)(const uint8_t *src, uint8_t *dst, int src_size); +extern void (*shuffle_bytes_3012)(const uint8_t *src, uint8_t *dst, int src_size); +extern void (*shuffle_bytes_3210)(const uint8_t *src, uint8_t *dst, int src_size); void rgb64tobgr48_nobswap(const uint8_t *src, uint8_t *dst, int src_size); void rgb64tobgr48_bswap(const uint8_t *src, uint8_t *dst, int src_size); @@ -76,10 +79,6 @@ void rgb15tobgr15(const uint8_t *src, uint8_t *dst, int src_size); void rgb12tobgr12(const uint8_t *src, uint8_t *dst, int src_size); void rgb12to15(const uint8_t *src, uint8_t *dst, int src_size); -extern void (*shuffle_bytes_1230)(const uint8_t *src, uint8_t *dst, int src_size); -extern void (*shuffle_bytes_3012)(const uint8_t *src, uint8_t *dst, int src_size); -extern void (*shuffle_bytes_3210)(const uint8_t *src, uint8_t *dst, int src_size); - void ff_rgb24toyv12_c(const uint8_t *src, uint8_t *ydst, uint8_t *udst, uint8_t *vdst, int width, int height, int lumStride, int chromStride, int srcStride, int32_t *rgb2yuv); -- 2.14.3 (Apple Git-98)