change sws_format_name to return const char*, supress many warnings

Originally committed as revision 26183 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

diff --git a/libswscale/swscale.c b/libswscale/swscale.c
index 1fc0ef4..2249108 100644 (file)
--- a/libswscale/swscale.c
+++ b/libswscale/swscale.c
@@ -276,7 +276,7 @@ static const AVOption options[] = {
 
 static AVClass sws_context_class = { "SWScaler", sws_context_to_name, options };
 
-char *sws_format_name(enum PixelFormat format)
+const char *sws_format_name(enum PixelFormat format)
 {
     switch (format) {
         case PIX_FMT_YUV420P:

diff --git a/libswscale/swscale.h b/libswscale/swscale.h
index afd3ff3..a0c735b 100644 (file)
--- a/libswscale/swscale.h
+++ b/libswscale/swscale.h
@@ -31,7 +31,7 @@
 
 #define LIBSWSCALE_VERSION_MAJOR 0
 #define LIBSWSCALE_VERSION_MINOR 5
-#define LIBSWSCALE_VERSION_MICRO 0
+#define LIBSWSCALE_VERSION_MICRO 1
 
 #define LIBSWSCALE_VERSION_INT  AV_VERSION_INT(LIBSWSCALE_VERSION_MAJOR, \
                                                LIBSWSCALE_VERSION_MINOR, \

diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h
index 81b2f1a..ee14fc3 100644 (file)
--- a/libswscale/swscale_internal.h
+++ b/libswscale/swscale_internal.h
@@ -193,7 +193,7 @@ void altivec_yuv2packedX (SwsContext *c,
                           int16_t *chrFilter, int16_t **chrSrc, int chrFilterSize,
                           uint8_t *dest, int dstW, int dstY);
 
-char *sws_format_name(int format);
+const char *sws_format_name(int format);
 
 //FIXME replace this with something faster
 #define isPlanarYUV(x)  (           \