diff options
Diffstat (limited to 'libswscale')
-rw-r--r-- | libswscale/ppc/swscale_altivec_template.c | 10 | ||||
-rw-r--r-- | libswscale/ppc/yuv2rgb_altivec.c | 4 | ||||
-rw-r--r-- | libswscale/swscale.c | 7 | ||||
-rw-r--r-- | libswscale/swscale.h | 4 | ||||
-rw-r--r-- | libswscale/swscale_internal.h | 4 |
5 files changed, 17 insertions, 12 deletions
diff --git a/libswscale/ppc/swscale_altivec_template.c b/libswscale/ppc/swscale_altivec_template.c index 0bf620bc83..c24970464c 100644 --- a/libswscale/ppc/swscale_altivec_template.c +++ b/libswscale/ppc/swscale_altivec_template.c @@ -85,8 +85,8 @@ altivec_packIntArrayToCharArray(int *val, uint8_t* dest, int dstW) { } static inline void -yuv2yuvX_altivec_real(int16_t *lumFilter, int16_t **lumSrc, int lumFilterSize, - int16_t *chrFilter, int16_t **chrSrc, int chrFilterSize, +yuv2yuvX_altivec_real(const int16_t *lumFilter, int16_t **lumSrc, int lumFilterSize, + const int16_t *chrFilter, 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)}; @@ -208,7 +208,11 @@ yuv2yuvX_altivec_real(int16_t *lumFilter, int16_t **lumSrc, int lumFilterSize, } } -static inline void hScale_altivec_real(int16_t *dst, int dstW, uint8_t *src, int srcW, int xInc, int16_t *filter, int16_t *filterPos, int filterSize) { +static inline void hScale_altivec_real(int16_t *dst, int dstW, + const uint8_t *src, int srcW, + int xInc, const int16_t *filter, + const int16_t *filterPos, int filterSize) +{ register int i; int __attribute__ ((aligned (16))) tempo[4]; diff --git a/libswscale/ppc/yuv2rgb_altivec.c b/libswscale/ppc/yuv2rgb_altivec.c index dc5894cda5..43879ea62d 100644 --- a/libswscale/ppc/yuv2rgb_altivec.c +++ b/libswscale/ppc/yuv2rgb_altivec.c @@ -787,8 +787,8 @@ void ff_yuv2rgb_init_tables_altivec(SwsContext *c, const int inv_table[4], int b void ff_yuv2packedX_altivec(SwsContext *c, - int16_t *lumFilter, int16_t **lumSrc, int lumFilterSize, - int16_t *chrFilter, int16_t **chrSrc, int chrFilterSize, + const int16_t *lumFilter, int16_t **lumSrc, int lumFilterSize, + const int16_t *chrFilter, int16_t **chrSrc, int chrFilterSize, uint8_t *dest, int dstW, int dstY) { int i,j; diff --git a/libswscale/swscale.c b/libswscale/swscale.c index a0954ad845..31e3b83cde 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -1792,9 +1792,9 @@ static void globalInit(void){ static SwsFunc getSwsFunc(SwsContext *c) { +#if CONFIG_RUNTIME_CPUDETECT && CONFIG_GPL int flags = c->flags; -#if CONFIG_RUNTIME_CPUDETECT && CONFIG_GPL #if ARCH_X86 // ordered per speed fastest first if (flags & SWS_CPU_CAPS_MMX2) { @@ -2371,7 +2371,8 @@ static int handle_jpeg(enum PixelFormat *format) } SwsContext *sws_getContext(int srcW, int srcH, enum PixelFormat srcFormat, int dstW, int dstH, enum PixelFormat dstFormat, int flags, - SwsFilter *srcFilter, SwsFilter *dstFilter, double *param){ + SwsFilter *srcFilter, SwsFilter *dstFilter, const double *param) +{ SwsContext *c; int i; @@ -3400,7 +3401,7 @@ void sws_freeContext(SwsContext *c){ struct SwsContext *sws_getCachedContext(struct SwsContext *context, int srcW, int srcH, enum PixelFormat srcFormat, int dstW, int dstH, enum PixelFormat dstFormat, int flags, - SwsFilter *srcFilter, SwsFilter *dstFilter, double *param) + SwsFilter *srcFilter, SwsFilter *dstFilter, const double *param) { static const double default_param[2] = {SWS_PARAM_DEFAULT, SWS_PARAM_DEFAULT}; diff --git a/libswscale/swscale.h b/libswscale/swscale.h index 4990ebf134..f5856c381c 100644 --- a/libswscale/swscale.h +++ b/libswscale/swscale.h @@ -130,7 +130,7 @@ void sws_freeContext(struct SwsContext *swsContext); struct SwsContext *sws_getContext(int srcW, int srcH, enum PixelFormat srcFormat, int dstW, int dstH, enum PixelFormat dstFormat, int flags, SwsFilter *srcFilter, - SwsFilter *dstFilter, double *param); + SwsFilter *dstFilter, const double *param); /** * Scales the image slice in \p srcSlice and puts the resulting scaled @@ -258,6 +258,6 @@ struct SwsContext *sws_getCachedContext(struct SwsContext *context, int srcW, int srcH, enum PixelFormat srcFormat, int dstW, int dstH, enum PixelFormat dstFormat, int flags, SwsFilter *srcFilter, - SwsFilter *dstFilter, double *param); + SwsFilter *dstFilter, const double *param); #endif /* SWSCALE_SWSCALE_H */ diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index eb11166e25..d9bbb6c1e2 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -289,8 +289,8 @@ SwsFunc ff_yuv2rgb_init_altivec(SwsContext *c); SwsFunc ff_yuv2rgb_get_func_ptr_bfin(SwsContext *c); void ff_bfin_get_unscaled_swscale(SwsContext *c); void ff_yuv2packedX_altivec(SwsContext *c, - int16_t *lumFilter, int16_t **lumSrc, int lumFilterSize, - int16_t *chrFilter, int16_t **chrSrc, int chrFilterSize, + const int16_t *lumFilter, int16_t **lumSrc, int lumFilterSize, + const int16_t *chrFilter, int16_t **chrSrc, int chrFilterSize, uint8_t *dest, int dstW, int dstY); const char *sws_format_name(int format); |