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
100 yuv2packedX_fn *yuv2packedX,100 yuv2packedX_fn *yuv2packedX,
101 yuv2anyX_fn *yuv2anyX);101 yuv2anyX_fn *yuv2anyX);
102 102
103int yuv420_rgb24_lsx(SwsContext *c, const uint8_t *src[], int srcStride[],103int yuv420_rgb24_lsx(SwsContext *c, const uint8_t *const src[], const int srcStride[],
104 int srcSliceY, int srcSliceH, uint8_t *dst[], int dstStride[]);104 int srcSliceY, int srcSliceH, uint8_t *const dst[], const int dstStride[]);
105 105
106int yuv420_bgr24_lsx(SwsContext *c, const uint8_t *src[], int srcStride[],106int yuv420_bgr24_lsx(SwsContext *c, const uint8_t *const src[], const int srcStride[],
107 int srcSliceY, int srcSliceH, uint8_t *dst[], int dstStride[]);107 int srcSliceY, int srcSliceH, uint8_t *const dst[], const int dstStride[]);
108 108
109int yuv420_rgba32_lsx(SwsContext *c, const uint8_t *src[], int srcStride[],109int yuv420_rgba32_lsx(SwsContext *c, const uint8_t *const src[], const int srcStride[],
110 int srcSliceY, int srcSliceH, uint8_t *dst[], int dstStride[]);110 int srcSliceY, int srcSliceH, uint8_t *const dst[], const int dstStride[]);
111 111
112int yuv420_bgra32_lsx(SwsContext *c, const uint8_t *src[], int srcStride[],112int yuv420_bgra32_lsx(SwsContext *c, const uint8_t *const src[], const int srcStride[],
113 int srcSliceY, int srcSliceH, uint8_t *dst[], int dstStride[]);113 int srcSliceY, int srcSliceH, uint8_t *const dst[], const int dstStride[]);
114 114
115int yuv420_argb32_lsx(SwsContext *c, const uint8_t *src[], int srcStride[],115int yuv420_argb32_lsx(SwsContext *c, const uint8_t *const src[], const int srcStride[],
116 int srcSliceY, int srcSliceH, uint8_t *dst[], int dstStride[]);116 int srcSliceY, int srcSliceH, uint8_t *const dst[], const int dstStride[]);
117 117
118int yuv420_abgr32_lsx(SwsContext *c, const uint8_t *src[], int srcStride[],118int yuv420_abgr32_lsx(SwsContext *c, const uint8_t *const src[], const int srcStride[],
119 int srcSliceY, int srcSliceH, uint8_t *dst[], int dstStride[]);119 int srcSliceY, int srcSliceH, uint8_t *const dst[], const int dstStride[]);
120 120
121#if HAVE_LASX121#if HAVE_LASX
122void ff_hscale_8_to_15_lasx(SwsContext *c, int16_t *dst, int dstW,122void 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
146void planar_rgb_to_y_lasx(uint8_t *_dst, const uint8_t *src[4], int width,146void planar_rgb_to_y_lasx(uint8_t *_dst, const uint8_t *src[4], int width,
147 int32_t *rgb2yuv, void *opq);147 int32_t *rgb2yuv, void *opq);
148 148
149int yuv420_rgb24_lasx(SwsContext *c, const uint8_t *src[], int srcStride[],149int yuv420_rgb24_lasx(SwsContext *c, const uint8_t *const src[], const int srcStride[],
150 int srcSliceY, int srcSliceH, uint8_t *dst[], int dstStride[]);150 int srcSliceY, int srcSliceH, uint8_t *const dst[], const int dstStride[]);
151 151
152int yuv420_bgr24_lasx(SwsContext *c, const uint8_t *src[], int srcStride[],152int yuv420_bgr24_lasx(SwsContext *c, const uint8_t *const src[], const int srcStride[],
153 int srcSliceY, int srcSliceH, uint8_t *dst[], int dstStride[]);153 int srcSliceY, int srcSliceH, uint8_t *const dst[], const int dstStride[]);
154 154
155int yuv420_rgba32_lasx(SwsContext *c, const uint8_t *src[], int srcStride[],155int yuv420_rgba32_lasx(SwsContext *c, const uint8_t *const src[], const int srcStride[],
156 int srcSliceY, int srcSliceH, uint8_t *dst[], int dstStride[]);156 int srcSliceY, int srcSliceH, uint8_t *const dst[], const int dstStride[]);
157 157
158int yuv420_bgra32_lasx(SwsContext *c, const uint8_t *src[], int srcStride[],158int yuv420_bgra32_lasx(SwsContext *c, const uint8_t *const src[], const int srcStride[],
159 int srcSliceY, int srcSliceH, uint8_t *dst[], int dstStride[]);159 int srcSliceY, int srcSliceH, uint8_t *const dst[], const int dstStride[]);
160 160
161int yuv420_argb32_lasx(SwsContext *c, const uint8_t *src[], int srcStride[],161int yuv420_argb32_lasx(SwsContext *c, const uint8_t *const src[], const int srcStride[],
162 int srcSliceY, int srcSliceH, uint8_t *dst[], int dstStride[]);162 int srcSliceY, int srcSliceH, uint8_t *const dst[], const int dstStride[]);
163 163
164int yuv420_abgr32_lasx(SwsContext *c, const uint8_t *src[], int srcStride[],164int yuv420_abgr32_lasx(SwsContext *c, const uint8_t *const src[], const int srcStride[],
165 int srcSliceY, int srcSliceH, uint8_t *dst[], int dstStride[]);165 int srcSliceY, int srcSliceH, uint8_t *const dst[], const int dstStride[]);
166 166
167void ff_interleave_bytes_lasx(const uint8_t *src1, const uint8_t *src2,167void ff_interleave_bytes_lasx(const uint8_t *src1, const uint8_t *src2,
168 uint8_t *dest, int width, int height,168 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