Mercurial > mplayer.hg

changeset 31715:b90559772910

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More const-correctness fixes to avoid warnings.
author reimar
date Sat, 24 Jul 2010 11:37:58 +0000
parents 140bde72c97f
children dcd1791cabb3
files libswscale/ppc/swscale_altivec_template.c libswscale/swscale_internal.h
diffstat 2 files changed, 12 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/libswscale/ppc/swscale_altivec_template.c	Sat Jul 24 11:33:28 2010 +0000
+++ b/libswscale/ppc/swscale_altivec_template.c	Sat Jul 24 11:37:58 2010 +0000
@@ -86,8 +86,8 @@
 }
 
 static inline void
-yuv2yuvX_altivec_real(const int16_t *lumFilter, int16_t **lumSrc, int lumFilterSize,
-                      const int16_t *chrFilter, int16_t **chrSrc, int chrFilterSize,
+yuv2yuvX_altivec_real(const int16_t *lumFilter, const int16_t **lumSrc, int lumFilterSize,
+                      const int16_t *chrFilter, const int16_t **chrSrc, int chrFilterSize,
                       uint8_t *dest, uint8_t *uDest, uint8_t *vDest, int dstW, int chrDstW)
 {
     const vector signed int vini = {(1 << 18), (1 << 18), (1 << 18), (1 << 18)};
@@ -389,14 +389,14 @@
     }
 }
 
-static inline int yv12toyuy2_unscaled_altivec(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
+static inline int yv12toyuy2_unscaled_altivec(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY,
                                               int srcSliceH, uint8_t* dstParam[], int dstStride_a[])
 {
     uint8_t *dst=dstParam[0] + dstStride_a[0]*srcSliceY;
     // yv12toyuy2(src[0], src[1], src[2], dst, c->srcW, srcSliceH, srcStride[0], srcStride[1], dstStride[0]);
-    uint8_t *ysrc = src[0];
-    uint8_t *usrc = src[1];
-    uint8_t *vsrc = src[2];
+    const uint8_t *ysrc = src[0];
+    const uint8_t *usrc = src[1];
+    const uint8_t *vsrc = src[2];
     const int width = c->srcW;
     const int height = srcSliceH;
     const int lumStride = srcStride[0];
@@ -467,14 +467,14 @@
     return srcSliceH;
 }
 
-static inline int yv12touyvy_unscaled_altivec(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
+static inline int yv12touyvy_unscaled_altivec(SwsContext *c, const uint8_t* src[], int srcStride[], int srcSliceY,
                                               int srcSliceH, uint8_t* dstParam[], int dstStride_a[])
 {
     uint8_t *dst=dstParam[0] + dstStride_a[0]*srcSliceY;
     // yv12toyuy2(src[0], src[1], src[2], dst, c->srcW, srcSliceH, srcStride[0], srcStride[1], dstStride[0]);
-    uint8_t *ysrc = src[0];
-    uint8_t *usrc = src[1];
-    uint8_t *vsrc = src[2];
+    const uint8_t *ysrc = src[0];
+    const uint8_t *usrc = src[1];
+    const uint8_t *vsrc = src[2];
     const int width = c->srcW;
     const int height = srcSliceH;
     const int lumStride = srcStride[0];
--- a/libswscale/swscale_internal.h	Sat Jul 24 11:33:28 2010 +0000
+++ b/libswscale/swscale_internal.h	Sat Jul 24 11:37:58 2010 +0000
@@ -331,8 +331,8 @@
 SwsFunc ff_yuv2rgb_get_func_ptr_bfin(SwsContext *c);
 void ff_bfin_get_unscaled_swscale(SwsContext *c);
 void ff_yuv2packedX_altivec(SwsContext *c,
-                            const int16_t *lumFilter, int16_t **lumSrc, int lumFilterSize,
-                            const int16_t *chrFilter, int16_t **chrSrc, int chrFilterSize,
+                            const int16_t *lumFilter, const int16_t **lumSrc, int lumFilterSize,
+                            const int16_t *chrFilter, const int16_t **chrSrc, int chrFilterSize,
                             uint8_t *dest, int dstW, int dstY);
 
 const char *sws_format_name(enum PixelFormat format);