Mercurial > mplayer.hg

changeset 30318:862c1c9d733b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Factorize error message logging, log it if the converter cannot be set.
author stefano
date Sun, 17 Jan 2010 23:07:37 +0000
parents 67b85934c374
children 841a6029e259
files libswscale/swscale.c
diffstat 1 files changed, 6 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/libswscale/swscale.c	Sun Jan 17 23:02:20 2010 +0000
+++ b/libswscale/swscale.c	Sun Jan 17 23:07:37 2010 +0000
@@ -2032,10 +2032,7 @@
     uint8_t *dstPtr= dst[0] + dstStride[0]*srcSliceY;
     const uint8_t *srcPtr= src[0];
 
-    if (!usePal(srcFormat))
-        av_log(c, AV_LOG_ERROR, "internal error %s -> %s converter\n",
-               sws_format_name(srcFormat), sws_format_name(dstFormat));
-    else {
+    if (usePal(srcFormat)) {
         switch (dstFormat) {
         case PIX_FMT_RGB32  : conv = palette8topacked32; break;
         case PIX_FMT_BGR32  : conv = palette8topacked32; break;
@@ -2043,17 +2040,19 @@
         case PIX_FMT_RGB32_1: conv = palette8topacked32; break;
         case PIX_FMT_RGB24  : conv = palette8topacked24; break;
         case PIX_FMT_BGR24  : conv = palette8topacked24; break;
-        default: av_log(c, AV_LOG_ERROR, "internal error %s -> %s converter\n",
-                        sws_format_name(srcFormat), sws_format_name(dstFormat)); break;
         }
     }
 
-    if (conv)
+    if (!conv)
+        av_log(c, AV_LOG_ERROR, "internal error %s -> %s converter\n",
+               sws_format_name(srcFormat), sws_format_name(dstFormat));
+    else {
         for (i=0; i<srcSliceH; i++) {
             conv(srcPtr, dstPtr, c->srcW, (uint8_t *) c->pal_rgb);
             srcPtr+= srcStride[0];
             dstPtr+= dstStride[0];
         }
+    }
 
     return srcSliceH;
 }