History

swscale: Fix conflicting types for loongarch

Build breaks after c1a0e657638f7007dcc807a2d985c22631fcd6d3

jinbo committed 2 years ago

Commit e6ecc1e1 parent 6a735e31 file · +24 −24Browse files

Unified · Split

libswscale/loongarch/swscale_loongarch.h+24−24
@@ -100,23 +100,23 @@ av_cold void ff_sws_init_output_lsx(SwsContext *c, · 99 unmodified lines
100100 yuv2packedX_fn *yuv2packedX,
101101 yuv2anyX_fn *yuv2anyX);
102102
103−int yuv420_rgb24_lsx(SwsContext *c, const uint8_t *src[], int srcStride[],
104− int srcSliceY, int srcSliceH, uint8_t *dst[], int dstStride[]);
103+int yuv420_rgb24_lsx(SwsContext *c, const uint8_t *const src[], const int srcStride[],
104+ int srcSliceY, int srcSliceH, uint8_t *const dst[], const int dstStride[]);
105105
106−int yuv420_bgr24_lsx(SwsContext *c, const uint8_t *src[], int srcStride[],
107− int srcSliceY, int srcSliceH, uint8_t *dst[], int dstStride[]);
106+int yuv420_bgr24_lsx(SwsContext *c, const uint8_t *const src[], const int srcStride[],
107+ int srcSliceY, int srcSliceH, uint8_t *const dst[], const int dstStride[]);
108108
109−int yuv420_rgba32_lsx(SwsContext *c, const uint8_t *src[], int srcStride[],
110− int srcSliceY, int srcSliceH, uint8_t *dst[], int dstStride[]);
109+int yuv420_rgba32_lsx(SwsContext *c, const uint8_t *const src[], const int srcStride[],
110+ int srcSliceY, int srcSliceH, uint8_t *const dst[], const int dstStride[]);
111111
112−int yuv420_bgra32_lsx(SwsContext *c, const uint8_t *src[], int srcStride[],
113− int srcSliceY, int srcSliceH, uint8_t *dst[], int dstStride[]);
112+int yuv420_bgra32_lsx(SwsContext *c, const uint8_t *const src[], const int srcStride[],
113+ int srcSliceY, int srcSliceH, uint8_t *const dst[], const int dstStride[]);
114114
115−int yuv420_argb32_lsx(SwsContext *c, const uint8_t *src[], int srcStride[],
116− int srcSliceY, int srcSliceH, uint8_t *dst[], int dstStride[]);
115+int yuv420_argb32_lsx(SwsContext *c, const uint8_t *const src[], const int srcStride[],
116+ int srcSliceY, int srcSliceH, uint8_t *const dst[], const int dstStride[]);
117117
118−int yuv420_abgr32_lsx(SwsContext *c, const uint8_t *src[], int srcStride[],
119− int srcSliceY, int srcSliceH, uint8_t *dst[], int dstStride[]);
118+int yuv420_abgr32_lsx(SwsContext *c, const uint8_t *const src[], const int srcStride[],
119+ int srcSliceY, int srcSliceH, uint8_t *const dst[], const int dstStride[]);
120120
121121 #if HAVE_LASX
122122 void ff_hscale_8_to_15_lasx(SwsContext *c, int16_t *dst, int dstW,
@@ -146,23 +146,23 @@ void planar_rgb_to_uv_lasx(uint8_t *_dstU, uint8_t *_dstV, const uint8_t *src[4] · 23 unmodified lines
146146 void planar_rgb_to_y_lasx(uint8_t *_dst, const uint8_t *src[4], int width,
147147 int32_t *rgb2yuv, void *opq);
148148
149−int yuv420_rgb24_lasx(SwsContext *c, const uint8_t *src[], int srcStride[],
150− int srcSliceY, int srcSliceH, uint8_t *dst[], int dstStride[]);
149+int yuv420_rgb24_lasx(SwsContext *c, const uint8_t *const src[], const int srcStride[],
150+ int srcSliceY, int srcSliceH, uint8_t *const dst[], const int dstStride[]);
151151
152−int yuv420_bgr24_lasx(SwsContext *c, const uint8_t *src[], int srcStride[],
153− int srcSliceY, int srcSliceH, uint8_t *dst[], int dstStride[]);
152+int yuv420_bgr24_lasx(SwsContext *c, const uint8_t *const src[], const int srcStride[],
153+ int srcSliceY, int srcSliceH, uint8_t *const dst[], const int dstStride[]);
154154
155−int yuv420_rgba32_lasx(SwsContext *c, const uint8_t *src[], int srcStride[],
156− int srcSliceY, int srcSliceH, uint8_t *dst[], int dstStride[]);
155+int yuv420_rgba32_lasx(SwsContext *c, const uint8_t *const src[], const int srcStride[],
156+ int srcSliceY, int srcSliceH, uint8_t *const dst[], const int dstStride[]);
157157
158−int yuv420_bgra32_lasx(SwsContext *c, const uint8_t *src[], int srcStride[],
159− int srcSliceY, int srcSliceH, uint8_t *dst[], int dstStride[]);
158+int yuv420_bgra32_lasx(SwsContext *c, const uint8_t *const src[], const int srcStride[],
159+ int srcSliceY, int srcSliceH, uint8_t *const dst[], const int dstStride[]);
160160
161−int yuv420_argb32_lasx(SwsContext *c, const uint8_t *src[], int srcStride[],
162− int srcSliceY, int srcSliceH, uint8_t *dst[], int dstStride[]);
161+int yuv420_argb32_lasx(SwsContext *c, const uint8_t *const src[], const int srcStride[],
162+ int srcSliceY, int srcSliceH, uint8_t *const dst[], const int dstStride[]);
163163
164−int yuv420_abgr32_lasx(SwsContext *c, const uint8_t *src[], int srcStride[],
165− int srcSliceY, int srcSliceH, uint8_t *dst[], int dstStride[]);
164+int yuv420_abgr32_lasx(SwsContext *c, const uint8_t *const src[], const int srcStride[],
165+ int srcSliceY, int srcSliceH, uint8_t *const dst[], const int dstStride[]);
166166
167167 void ff_interleave_bytes_lasx(const uint8_t *src1, const uint8_t *src2,
168168 uint8_t *dest, int width, int height,

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t