libextractor

commit 96dda0b67d27b9077b21f0c010321e867a2f83c3
parent 4639f083eadf19da517c877d0c6dfd584bace8fc
Author: Christian Grothoff <christian@grothoff.org>
Date:   Mon, 16 Feb 2009 06:01:43 +0000

warnings

Diffstat:
M
src/plugins/ffmpeg/libavutil/internal.h
 | 
6
+++---
M
src/plugins/ffmpeg/libswscale/swscale.c
 | 
4
++--
M
src/plugins/ffmpeg/libswscale/swscale.h
 | 
4
++--

3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/plugins/ffmpeg/libavutil/internal.h b/src/plugins/ffmpeg/libavutil/internal.h
@@ -277,21 +277,21 @@ if((y)<(x)){\
 }
 
 #ifndef HAVE_LLRINT
-static av_always_inline av_const long long llrint(double x)
+av_always_inline av_const long long llrint(double x)
 {
     return rint(x);
 }
 #endif /* HAVE_LLRINT */
 
 #ifndef HAVE_LRINT
-static av_always_inline av_const long int lrint(double x)
+av_always_inline av_const long int lrint(double x)
 {
     return rint(x);
 }
 #endif /* HAVE_LRINT */
 
 #ifndef HAVE_LRINTF
-static av_always_inline av_const long int lrintf(float x)
+av_always_inline av_const long int lrintf(float x)
 {
     return (int)(rint(x));
 }
diff --git a/src/plugins/ffmpeg/libswscale/swscale.c b/src/plugins/ffmpeg/libswscale/swscale.c
@@ -1968,7 +1968,7 @@ static int handle_jpeg(int *format)
 }
 
 SwsContext *sws_getContext(int srcW, int srcH, int srcFormat, int dstW, int dstH, int dstFormat, int flags,
-                           SwsFilter *srcFilter, SwsFilter *dstFilter, double *param){
+                           SwsFilter *srcFilter, SwsFilter *dstFilter, const double *param){
 
     SwsContext *c;
     int i;
@@ -2906,7 +2906,7 @@ void sws_freeContext(SwsContext *c){
 struct SwsContext *sws_getCachedContext(struct SwsContext *context,
                                         int srcW, int srcH, int srcFormat,
                                         int dstW, int dstH, int 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/src/plugins/ffmpeg/libswscale/swscale.h b/src/plugins/ffmpeg/libswscale/swscale.h
@@ -109,7 +109,7 @@ struct SwsContext;
 void sws_freeContext(struct SwsContext *swsContext);
 
 struct SwsContext *sws_getContext(int srcW, int srcH, int srcFormat, int dstW, int dstH, int dstFormat, int flags,
-                                  SwsFilter *srcFilter, SwsFilter *dstFilter, double *param);
+                                  SwsFilter *srcFilter, SwsFilter *dstFilter, const double *param);
 int sws_scale(struct SwsContext *context, uint8_t* src[], int srcStride[], int srcSliceY,
               int srcSliceH, uint8_t* dst[], int dstStride[]);
 int sws_scale_ordered(struct SwsContext *context, uint8_t* src[], int srcStride[], int srcSliceY,
@@ -141,6 +141,6 @@ void sws_freeFilter(SwsFilter *filter);
 struct SwsContext *sws_getCachedContext(struct SwsContext *context,
                                         int srcW, int srcH, int srcFormat,
                                         int dstW, int dstH, int dstFormat, int flags,
-                                        SwsFilter *srcFilter, SwsFilter *dstFilter, double *param);
+                                        SwsFilter *srcFilter, SwsFilter *dstFilter, const double *param);
 
 #endif /* FFMPEG_SWSCALE_H */