Mercurial > mplayer.hg

changeset 26914:f910db69b343

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cast to correct type, suppress warnings
author bcoudurier
date Sun, 01 Jun 2008 03:28:15 +0000
parents 2ef7839deae2
children 0348d37f5933
files libswscale/swscale_template.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libswscale/swscale_template.c	Sun Jun 01 03:27:45 2008 +0000
+++ b/libswscale/swscale_template.c	Sun Jun 01 03:28:15 2008 +0000
@@ -2539,7 +2539,7 @@
     }
     else if (srcFormat==PIX_FMT_RGB8 || srcFormat==PIX_FMT_BGR8 || srcFormat==PIX_FMT_PAL8 || srcFormat==PIX_FMT_BGR4_BYTE  || srcFormat==PIX_FMT_RGB4_BYTE)
     {
-        RENAME(palToY)(formatConvBuffer, src, srcW, pal);
+        RENAME(palToY)(formatConvBuffer, src, srcW, (uint32_t*)pal);
         src= formatConvBuffer;
     }
 
@@ -2755,7 +2755,7 @@
     }
     else if (srcFormat==PIX_FMT_RGB8 || srcFormat==PIX_FMT_BGR8 || srcFormat==PIX_FMT_PAL8 || srcFormat==PIX_FMT_BGR4_BYTE  || srcFormat==PIX_FMT_RGB4_BYTE)
     {
-        RENAME(palToUV)(formatConvBuffer, formatConvBuffer+VOFW, src1, src2, srcW, pal);
+        RENAME(palToUV)(formatConvBuffer, formatConvBuffer+VOFW, src1, src2, srcW, (uint32_t*)pal);
         src1= formatConvBuffer;
         src2= formatConvBuffer+VOFW;
     }