[GNUnet-SVN] r8247 - in Extractor/src/plugins/ffmpeg: libavutil libswscale

[gnunet]

Author: grothoff
Date: 2009-02-15 23:01:43 -0700 (Sun, 15 Feb 2009)
New Revision: 8247

Modified:
   Extractor/src/plugins/ffmpeg/libavutil/internal.h
   Extractor/src/plugins/ffmpeg/libswscale/swscale.c
   Extractor/src/plugins/ffmpeg/libswscale/swscale.h
Log:
warnings

Modified: Extractor/src/plugins/ffmpeg/libavutil/internal.h
===================================================================
--- Extractor/src/plugins/ffmpeg/libavutil/internal.h   2009-02-16 05:35:26 UTC 
(rev 8246)
+++ Extractor/src/plugins/ffmpeg/libavutil/internal.h   2009-02-16 06:01:43 UTC 
(rev 8247)
@@ -277,21 +277,21 @@
 }
 
 #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));
 }

Modified: Extractor/src/plugins/ffmpeg/libswscale/swscale.c
===================================================================
--- Extractor/src/plugins/ffmpeg/libswscale/swscale.c   2009-02-16 05:35:26 UTC 
(rev 8246)
+++ Extractor/src/plugins/ffmpeg/libswscale/swscale.c   2009-02-16 06:01:43 UTC 
(rev 8247)
@@ -1968,7 +1968,7 @@
 }
 
 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 @@
 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};
 

Modified: Extractor/src/plugins/ffmpeg/libswscale/swscale.h
===================================================================
--- Extractor/src/plugins/ffmpeg/libswscale/swscale.h   2009-02-16 05:35:26 UTC 
(rev 8246)
+++ Extractor/src/plugins/ffmpeg/libswscale/swscale.h   2009-02-16 06:01:43 UTC 
(rev 8247)
@@ -109,7 +109,7 @@
 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 @@
 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 */