Mercurial > mplayer.hg

changeset 26151:5884743208b6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
change sws_format_name to return const char*, supress many warnings
author bcoudurier
date Thu, 06 Mar 2008 11:32:25 +0000
parents 1df4a811aa9c
children abc42d96896c
files libswscale/swscale.c libswscale/swscale.h libswscale/swscale_internal.h
diffstat 3 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libswscale/swscale.c	Thu Mar 06 09:51:25 2008 +0000
+++ b/libswscale/swscale.c	Thu Mar 06 11:32:25 2008 +0000
@@ -276,7 +276,7 @@
 
 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:
--- a/libswscale/swscale.h	Thu Mar 06 09:51:25 2008 +0000
+++ b/libswscale/swscale.h	Thu Mar 06 11:32:25 2008 +0000
@@ -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, \
--- a/libswscale/swscale_internal.h	Thu Mar 06 09:51:25 2008 +0000
+++ b/libswscale/swscale_internal.h	Thu Mar 06 11:32:25 2008 +0000
@@ -193,7 +193,7 @@
                           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)  (           \