# HG changeset patch
# User stefano
# Date 1263769201 0
# Node ID 93e7fdf664a72566b277b9ff5676912d5bb5054c
# Parent  826b65c76d033a97d4eedda92510a7d55599aa41
Make the pal2rgbWrapper set and use the converter in pal2rgbWrapper
only if the input format is paletted.

Fix potential crashes/weirdness if the input format is non-paletted.

diff -r 826b65c76d03 -r 93e7fdf664a7 libswscale/swscale.c
--- a/libswscale/swscale.c	Sun Jan 17 19:26:35 2010 +0000
+++ b/libswscale/swscale.c	Sun Jan 17 23:00:01 2010 +0000
@@ -2035,7 +2035,7 @@
     if (!usePal(srcFormat))
         av_log(c, AV_LOG_ERROR, "internal error %s -> %s converter\n",
                sws_format_name(srcFormat), sws_format_name(dstFormat));
-
+    else {
     switch(dstFormat) {
     case PIX_FMT_RGB32  : conv = palette8topacked32; break;
     case PIX_FMT_BGR32  : conv = palette8topacked32; break;
@@ -2046,8 +2046,9 @@
     default: av_log(c, AV_LOG_ERROR, "internal error %s -> %s converter\n",
                     sws_format_name(srcFormat), sws_format_name(dstFormat)); break;
     }
-
-
+    }
+
+    if (conv)
     for (i=0; i<srcSliceH; i++) {
         conv(srcPtr, dstPtr, c->srcW, (uint8_t *) c->pal_rgb);
         srcPtr+= srcStride[0];