From fb984553d32a8b5a6ac62210045126c9796811a8 Mon Sep 17 00:00:00 2001 From: bcoudurier Date: Thu, 6 Mar 2008 11:32:25 +0000 Subject: [PATCH] change sws_format_name to return const char*, supress many warnings git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26183 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libswscale/swscale.c | 2 +- libswscale/swscale.h | 2 +- libswscale/swscale_internal.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 1fc0ef47d6..22491085cf 100644 --- 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 afd3ff3754..a0c735b696 100644 --- 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 81b2f1afb9..ee14fc33bc 100644 --- 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) ( \