Commit 912e7516 authored by Piotr Bandurski's avatar Piotr Bandurski Committed by Carl Eugen Hoyos

Support 8bpp grayscale Sun Rasterfile images.

Fixes ticket #865.
parent 2ba34163
...@@ -93,7 +93,7 @@ static int sunrast_decode_frame(AVCodecContext *avctx, void *data, ...@@ -93,7 +93,7 @@ static int sunrast_decode_frame(AVCodecContext *avctx, void *data,
avctx->pix_fmt = PIX_FMT_MONOWHITE; avctx->pix_fmt = PIX_FMT_MONOWHITE;
break; break;
case 8: case 8:
avctx->pix_fmt = PIX_FMT_PAL8; avctx->pix_fmt = maplength ? PIX_FMT_PAL8 : PIX_FMT_GRAY8;
break; break;
case 24: case 24:
avctx->pix_fmt = (type == RT_FORMAT_RGB) ? PIX_FMT_RGB24 : PIX_FMT_BGR24; 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, ...@@ -121,7 +121,7 @@ static int sunrast_decode_frame(AVCodecContext *avctx, void *data,
if (depth != 8 && maplength) { if (depth != 8 && maplength) {
av_log(avctx, AV_LOG_WARNING, "useless colormap found or file is corrupted, trying to recover\n"); 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; unsigned int len = maplength / 3;
if (!maplength) { if (!maplength) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment