Ticket #865: grayras.diff

libavcodec/sunrast.c

@@ -93 +93 @@
             avctx->pix_fmt = PIX_FMT_MONOWHITE;
             break;
         case 8:
-            avctx->pix_fmt = PIX_FMT_PAL8;
+            /*
+            if(!grayscale)
+                avctx->pix_fmt = PIX_FMT_PAL8;
+            else
+            */
+                avctx->pix_fmt = PIX_FMT_GRAY8;
             break;
         case 24:
             avctx->pix_fmt = (type == RT_FORMAT_RGB) ? PIX_FMT_RGB24 : PIX_FMT_BGR24;
@@ -121 +126 @@
     if (depth != 8 && maplength) {
         av_log(avctx, AV_LOG_WARNING, "useless colormap found or file is corrupted, trying to recover\n");
 
-    } else if (depth == 8) {
-        unsigned int len = maplength / 3;
+    } else if (depth == 8 /*&& !grayscale */) {
+/*        unsigned int len = maplength / 3;
 
         if (!maplength) {
             av_log(avctx, AV_LOG_ERROR, "colormap expected\n");
@@ -136 +141 @@
         ptr = p->data[1];
         for (x=0; x<len; x++, ptr+=4)
             *(uint32_t *)ptr = (0xFF<<24) + (buf[x]<<16) + (buf[len+x]<<8) + buf[len+len+x];
+*/
     }
 
     buf += maplength;