diff options
| author | Diego Biurrun <diego@biurrun.de> | 2012-04-02 19:03:30 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2012-04-09 20:39:33 +0200 |
| commit | 02c39f056a77427850f43aaa19b8856534a1693a (patch) | |
| tree | 7c350f97abd30ec98a6429fc63d256bbbad75151 | |
| parent | b073819bc974965056f435d69dc51e9ec5877395 (diff) | |
| download | ffmpeg-02c39f056a77427850f43aaa19b8856534a1693a.tar.gz | |
ppc: Add/remove a number of const qualifiers to fix related warnings.
| -rw-r--r-- | libavcodec/ppc/gmc_altivec.c | 2 | ||||
| -rw-r--r-- | libavcodec/ppc/int_altivec.c | 3 | ||||
| -rw-r--r-- | libswscale/ppc/yuv2rgb_altivec.c | 10 |
3 files changed, 8 insertions, 7 deletions
diff --git a/libavcodec/ppc/gmc_altivec.c b/libavcodec/ppc/gmc_altivec.c index 965921ab7f..fb67b9ec36 100644 --- a/libavcodec/ppc/gmc_altivec.c +++ b/libavcodec/ppc/gmc_altivec.c @@ -48,7 +48,7 @@ void ff_gmc1_altivec(uint8_t *dst /* align 8 */, uint8_t *src /* align1 */, int unsigned long dst_odd = (unsigned long)dst & 0x0000000F; unsigned long src_really_odd = (unsigned long)src & 0x0000000F; - tempA = vec_ld(0, (unsigned short*)ABCD); + tempA = vec_ld(0, (const unsigned short*)ABCD); Av = vec_splat(tempA, 0); Bv = vec_splat(tempA, 1); Cv = vec_splat(tempA, 2); diff --git a/libavcodec/ppc/int_altivec.c b/libavcodec/ppc/int_altivec.c index ce996fa68a..f81b478449 100644 --- a/libavcodec/ppc/int_altivec.c +++ b/libavcodec/ppc/int_altivec.c @@ -79,7 +79,8 @@ static int ssd_int8_vs_int16_altivec(const int8_t *pix1, const int16_t *pix2, return u.score[3]; } -static int32_t scalarproduct_int16_altivec(const int16_t * v1, const int16_t * v2, int order, const int shift) +static int32_t scalarproduct_int16_altivec(int16_t *v1, const int16_t *v2, + int order, const int shift) { int i; LOAD_ZERO; diff --git a/libswscale/ppc/yuv2rgb_altivec.c b/libswscale/ppc/yuv2rgb_altivec.c index 523d9966c6..3a140cb1f8 100644 --- a/libswscale/ppc/yuv2rgb_altivec.c +++ b/libswscale/ppc/yuv2rgb_altivec.c @@ -300,7 +300,7 @@ static int altivec_ ## name(SwsContext *c, const unsigned char **in, \ vector signed short R1, G1, B1; \ vector unsigned char R, G, B; \ \ - vector unsigned char *y1ivP, *y2ivP, *uivP, *vivP; \ + const vector unsigned char *y1ivP, *y2ivP, *uivP, *vivP; \ vector unsigned char align_perm; \ \ vector signed short lCY = c->CY; \ @@ -335,10 +335,10 @@ static int altivec_ ## name(SwsContext *c, const unsigned char **in, \ vec_dstst(oute, (0x02000002 | (((w * 3 + 32) / 32) << 16)), 1); \ \ for (j = 0; j < w / 16; j++) { \ - y1ivP = (vector unsigned char *) y1i; \ - y2ivP = (vector unsigned char *) y2i; \ - uivP = (vector unsigned char *) ui; \ - vivP = (vector unsigned char *) vi; \ + y1ivP = (const vector unsigned char *) y1i; \ + y2ivP = (const vector unsigned char *) y2i; \ + uivP = (const vector unsigned char *) ui; \ + vivP = (const vector unsigned char *) vi; \ \ align_perm = vec_lvsl(0, y1i); \ y0 = (vector unsigned char) \ |