summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfred Wingate <parona@protonmail.com>2023-11-14 13:26:47 +0000
committerAnton Khirnov <anton@khirnov.net>2023-12-02 11:22:46 +0100
commite5ce473040ae3e78da80b8a7c6ee35778b21d53c (patch)
treefd5a2445988c6242f7819666f8f3eae6b887ffb3
parent2182173a6933c02b0853751034bd5e0bf829b5f7 (diff)
swscale/x86/rgb_2_rgb: Add opaque pointer to missed definitions of ff_nv12ToUV
Opaque parameters were previously added to the original definition of ff_nv12ToUV, leading to gcc noticing a type mismatch with -Wlto-type-mismatch. https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/f2de911818fbd7e73343803626b697fd0c968121 https://bugs.gentoo.org/907484 Signed-off-by: Alfred Wingate <parona@protonmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
-rw-r--r--libswscale/x86/rgb2rgb_template.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libswscale/x86/rgb2rgb_template.c b/libswscale/x86/rgb2rgb_template.c
index 4aba25dd51..edbacea784 100644
--- a/libswscale/x86/rgb2rgb_template.c
+++ b/libswscale/x86/rgb2rgb_template.c
@@ -1823,7 +1823,8 @@ void RENAME(ff_nv12ToUV)(uint8_t *dstU, uint8_t *dstV,
const uint8_t *src1,
const uint8_t *src2,
int w,
- uint32_t *unused2);
+ uint32_t *unused2,
+ void *opq);
static void RENAME(deinterleaveBytes)(const uint8_t *src, uint8_t *dst1, uint8_t *dst2,
int width, int height, int srcStride,
int dst1Stride, int dst2Stride)
@@ -1831,7 +1832,7 @@ static void RENAME(deinterleaveBytes)(const uint8_t *src, uint8_t *dst1, uint8_t
int h;
for (h = 0; h < height; h++) {
- RENAME(ff_nv12ToUV)(dst1, dst2, NULL, src, NULL, width, NULL);
+ RENAME(ff_nv12ToUV)(dst1, dst2, NULL, src, NULL, width, NULL, NULL);
src += srcStride;
dst1 += dst1Stride;
dst2 += dst2Stride;