History

bfin: libswscale: add const where appropriate to fix warnings

Mans Rullgard committed 14 years ago

Commit 4996e8f1 parent 6bac8972 files · +25 −21Browse files

Unified · Split

2 files
  1. libswscale/bfin/swscale_bfin.c +8 −8
  2. libswscale/bfin/yuv2rgb_bfin.c +17 −13
libswscale/bfin/swscale_bfin.c+8−8
@@ -39,14 +39,14 @@ int ff_bfin_yuyvtoyv12(const uint8_t *src, uint8_t *ydst, uint8_t *udst, · 38 unmodified lines
3939 uint8_t *vdst, int width, int height,
4040 int lumStride, int chromStride, int srcStride) L1CODE;
4141
42−static int uyvytoyv12_unscaled(SwsContext *c, uint8_t *src[], int srcStride[],
43− int srcSliceY, int srcSliceH, uint8_t *dst[],
44− int dstStride[])
42+static int uyvytoyv12_unscaled(SwsContext *c, const uint8_t *src[],
43+ int srcStride[], int srcSliceY, int srcSliceH,
44+ uint8_t *dst[], int dstStride[])
4545 {
4646 uint8_t *dsty = dst[0] + dstStride[0] * srcSliceY;
4747 uint8_t *dstu = dst[1] + dstStride[1] * srcSliceY / 2;
4848 uint8_t *dstv = dst[2] + dstStride[2] * srcSliceY / 2;
49− uint8_t *ip = src[0] + srcStride[0] * srcSliceY;
49+ const uint8_t *ip = src[0] + srcStride[0] * srcSliceY;
5050 int w = dstStride[0];
5151
5252 ff_bfin_uyvytoyv12(ip, dsty, dstu, dstv, w, srcSliceH,
@@ -55,14 +55,14 @@ static int uyvytoyv12_unscaled(SwsContext *c, uint8_t *src[], int srcStride[], · 2 unmodified lines
5555 return srcSliceH;
5656 }
5757
58−static int yuyvtoyv12_unscaled(SwsContext *c, uint8_t *src[], int srcStride[],
59− int srcSliceY, int srcSliceH, uint8_t *dst[],
60− int dstStride[])
58+static int yuyvtoyv12_unscaled(SwsContext *c, const uint8_t *src[],
59+ int srcStride[], int srcSliceY, int srcSliceH,
60+ uint8_t *dst[], int dstStride[])
6161 {
6262 uint8_t *dsty = dst[0] + dstStride[0] * srcSliceY;
6363 uint8_t *dstu = dst[1] + dstStride[1] * srcSliceY / 2;
6464 uint8_t *dstv = dst[2] + dstStride[2] * srcSliceY / 2;
65− uint8_t *ip = src[0] + srcStride[0] * srcSliceY;
65+ const uint8_t *ip = src[0] + srcStride[0] * srcSliceY;
6666 int w = dstStride[0];
6767
6868 ff_bfin_yuyvtoyv12(ip, dsty, dstu, dstv, w, srcSliceH,
libswscale/bfin/yuv2rgb_bfin.c+17−13
@@ -32,17 +32,20 @@ · 31 unmodified lines
3232 #define L1CODE
3333 #endif
3434
35−void ff_bfin_yuv2rgb555_line(uint8_t *Y, uint8_t *U, uint8_t *V, uint8_t *out,
35+void ff_bfin_yuv2rgb555_line(const uint8_t *Y, const uint8_t *U,
36+ const uint8_t *V, uint8_t *out,
3637 int w, uint32_t *coeffs) L1CODE;
3738
38−void ff_bfin_yuv2rgb565_line(uint8_t *Y, uint8_t *U, uint8_t *V, uint8_t *out,
39+void ff_bfin_yuv2rgb565_line(const uint8_t *Y, const uint8_t *U,
40+ const uint8_t *V, uint8_t *out,
3941 int w, uint32_t *coeffs) L1CODE;
4042
41−void ff_bfin_yuv2rgb24_line(uint8_t *Y, uint8_t *U, uint8_t *V, uint8_t *out,
43+void ff_bfin_yuv2rgb24_line(const uint8_t *Y, const uint8_t *U,
44+ const uint8_t *V, uint8_t *out,
4245 int w, uint32_t *coeffs) L1CODE;
4346
44−typedef void (*ltransform)(uint8_t *Y, uint8_t *U, uint8_t *V, uint8_t *out,
45− int w, uint32_t *coeffs);
47+typedef void (*ltransform)(const uint8_t *Y, const uint8_t *U, const uint8_t *V,
48+ uint8_t *out, int w, uint32_t *coeffs);
4649
4750 static void bfin_prepare_coefficients(SwsContext *c, int rgb, int masks)
4851 {
@@ -80,12 +83,13 @@ static void bfin_prepare_coefficients(SwsContext *c, int rgb, int masks) · 31 unmodified lines
8083 }
8184 }
8285
83−static int core_yuv420_rgb(SwsContext *c, uint8_t **in, int *instrides,
86+static int core_yuv420_rgb(SwsContext *c, const uint8_t **in, int *instrides,
8487 int srcSliceY, int srcSliceH, uint8_t **oplanes,
8588 int *outstrides, ltransform lcscf,
8689 int rgb, int masks)
8790 {
88− uint8_t *py, *pu, *pv, *op;
91+ const uint8_t *py, *pu, *pv;
92+ uint8_t *op;
8993 int w = instrides[0];
9094 int h2 = srcSliceH >> 1;
9195 int i;
@@ -115,7 +119,7 @@ static int core_yuv420_rgb(SwsContext *c, uint8_t **in, int *instrides, · 23 unmodified lines
115119 return srcSliceH;
116120 }
117121
118−static int bfin_yuv420_rgb555(SwsContext *c, uint8_t **in, int *instrides,
122+static int bfin_yuv420_rgb555(SwsContext *c, const uint8_t **in, int *instrides,
119123 int srcSliceY, int srcSliceH,
120124 uint8_t **oplanes, int *outstrides)
121125 {
@@ -123,7 +127,7 @@ static int bfin_yuv420_rgb555(SwsContext *c, uint8_t **in, int *instrides, · 1 unmodified line
123127 outstrides, ff_bfin_yuv2rgb555_line, 1, 555);
124128 }
125129
126−static int bfin_yuv420_bgr555(SwsContext *c, uint8_t **in, int *instrides,
130+static int bfin_yuv420_bgr555(SwsContext *c, const uint8_t **in, int *instrides,
127131 int srcSliceY, int srcSliceH,
128132 uint8_t **oplanes, int *outstrides)
129133 {
@@ -131,7 +135,7 @@ static int bfin_yuv420_bgr555(SwsContext *c, uint8_t **in, int *instrides, · 1 unmodified line
131135 outstrides, ff_bfin_yuv2rgb555_line, 0, 555);
132136 }
133137
134−static int bfin_yuv420_rgb24(SwsContext *c, uint8_t **in, int *instrides,
138+static int bfin_yuv420_rgb24(SwsContext *c, const uint8_t **in, int *instrides,
135139 int srcSliceY, int srcSliceH,
136140 uint8_t **oplanes, int *outstrides)
137141 {
@@ -139,7 +143,7 @@ static int bfin_yuv420_rgb24(SwsContext *c, uint8_t **in, int *instrides, · 1 unmodified line
139143 outstrides, ff_bfin_yuv2rgb24_line, 1, 888);
140144 }
141145
142−static int bfin_yuv420_bgr24(SwsContext *c, uint8_t **in, int *instrides,
146+static int bfin_yuv420_bgr24(SwsContext *c, const uint8_t **in, int *instrides,
143147 int srcSliceY, int srcSliceH,
144148 uint8_t **oplanes, int *outstrides)
145149 {
@@ -147,7 +151,7 @@ static int bfin_yuv420_bgr24(SwsContext *c, uint8_t **in, int *instrides, · 1 unmodified line
147151 outstrides, ff_bfin_yuv2rgb24_line, 0, 888);
148152 }
149153
150−static int bfin_yuv420_rgb565(SwsContext *c, uint8_t **in, int *instrides,
154+static int bfin_yuv420_rgb565(SwsContext *c, const uint8_t **in, int *instrides,
151155 int srcSliceY, int srcSliceH,
152156 uint8_t **oplanes, int *outstrides)
153157 {
@@ -155,7 +159,7 @@ static int bfin_yuv420_rgb565(SwsContext *c, uint8_t **in, int *instrides, · 1 unmodified line
155159 outstrides, ff_bfin_yuv2rgb565_line, 1, 565);
156160 }
157161
158−static int bfin_yuv420_bgr565(SwsContext *c, uint8_t **in, int *instrides,
162+static int bfin_yuv420_bgr565(SwsContext *c, const uint8_t **in, int *instrides,
159163 int srcSliceY, int srcSliceH,
160164 uint8_t **oplanes, int *outstrides)
161165 {

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