[FFmpeg-cvslog] Support 8bpp grayscale Sun Rasterfile images.

Piotr Bandurski git at videolan.org
Tue Jan 3 13:51:54 CET 2012


ffmpeg | branch: master | Piotr Bandurski <ami_stuff at o2.pl> | Tue Jan  3 13:24:50 2012 +0100| [912e75169bcdf1599dc0991b99d7c717dd5c6769] | committer: Carl Eugen Hoyos

Support 8bpp grayscale Sun Rasterfile images.

Fixes ticket #865.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=912e75169bcdf1599dc0991b99d7c717dd5c6769
---

 libavcodec/sunrast.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/sunrast.c b/libavcodec/sunrast.c
index 3e1cea6..c33265d 100644
--- a/libavcodec/sunrast.c
+++ b/libavcodec/sunrast.c
@@ -93,7 +93,7 @@ static int sunrast_decode_frame(AVCodecContext *avctx, void *data,
             avctx->pix_fmt = PIX_FMT_MONOWHITE;
             break;
         case 8:
-            avctx->pix_fmt = PIX_FMT_PAL8;
+            avctx->pix_fmt = maplength ? PIX_FMT_PAL8 : PIX_FMT_GRAY8;
             break;
         case 24:
             avctx->pix_fmt = (type == RT_FORMAT_RGB) ? PIX_FMT_RGB24 : PIX_FMT_BGR24;
@@ -121,7 +121,7 @@ static int sunrast_decode_frame(AVCodecContext *avctx, void *data,
     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) {
+    } else if (maplength) {
         unsigned int len = maplength / 3;
 
         if (!maplength) {



More information about the ffmpeg-cvslog mailing list