# HG changeset patch
# User stefano
# Date 1263741085 0
# Node ID a526bb14dea7a0e4cc64d02096086b72a1a0a61d
# Parent  7f759148256494919e045d380b8515e15aa591f0
Factorize error message logging in rgb2rgbWrapper().

diff -r 7f7591482564 -r a526bb14dea7 libswscale/swscale.c
--- a/libswscale/swscale.c	Sun Jan 17 15:08:31 2010 +0000
+++ b/libswscale/swscale.c	Sun Jan 17 15:11:25 2010 +0000
@@ -2085,8 +2085,6 @@
         case 0x83: conv= rgb15to32; break;
         case 0x84: conv= rgb16to32; break;
         case 0x86: conv= rgb24to32; break;
-        default: av_log(c, AV_LOG_ERROR, "internal error %s -> %s converter\n",
-                        sws_format_name(srcFormat), sws_format_name(dstFormat)); break;
         }
     } else if (  (isBGR(srcFormat) && isRGB(dstFormat))
              || (isRGB(srcFormat) && isBGR(dstFormat))) {
@@ -2107,15 +2105,13 @@
         case 0x84: conv= rgb16tobgr32; break;
         case 0x86: conv= rgb24tobgr32; break;
         case 0x88: conv= rgb32tobgr32; break;
-        default: av_log(c, AV_LOG_ERROR, "internal error %s -> %s converter\n",
-                        sws_format_name(srcFormat), sws_format_name(dstFormat)); break;
         }
-    } else {
+    }
+
+    if (!conv) {
         av_log(c, AV_LOG_ERROR, "internal error %s -> %s converter\n",
                sws_format_name(srcFormat), sws_format_name(dstFormat));
-    }
-
-    if(conv) {
+    } else {
         const uint8_t *srcPtr= src[0];
         if(srcFormat == PIX_FMT_RGB32_1 || srcFormat == PIX_FMT_BGR32_1)
             srcPtr += ALT32_CORR;