Skip to content

F
ffmpeg
Commit 384f26f4 authored by Peter Ross's avatar Peter Ross
Browse files
Options

Sun Raster RGB support 

Originally committed as revision 20162 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent e18027ac
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
libavcodec/sunrast.c
View file @ 384f26f4
...@@ -64,7 +64,7 @@ static int sunrast_decode_frame(AVCodecContext *avctx, void *data, ...@@ -64,7 +64,7 @@ static int sunrast_decode_frame(AVCodecContext *avctx, void *data,
maptype = AV_RB32(buf+24); maptype = AV_RB32(buf+24);
maplength = AV_RB32(buf+28); maplength = AV_RB32(buf+28);
if (type > RT_BYTE_ENCODED && type <= RT_FORMAT_IFF) { if (type == RT_FORMAT_TIFF || type == RT_FORMAT_IFF) {
av_log(avctx, AV_LOG_ERROR, "unsupported (compression) type\n"); av_log(avctx, AV_LOG_ERROR, "unsupported (compression) type\n");
return -1; return -1;
} }
...@@ -87,7 +87,7 @@ static int sunrast_decode_frame(AVCodecContext *avctx, void *data, ...@@ -87,7 +87,7 @@ static int sunrast_decode_frame(AVCodecContext *avctx, void *data,
avctx->pix_fmt = PIX_FMT_PAL8; avctx->pix_fmt = PIX_FMT_PAL8;
break; break;
case 24: case 24:
avctx->pix_fmt = PIX_FMT_BGR24; avctx->pix_fmt = (type == RT_FORMAT_RGB) ? PIX_FMT_RGB24 : PIX_FMT_BGR24;
break; break;
default: default:
av_log(avctx, AV_LOG_ERROR, "invalid depth\n"); av_log(avctx, AV_LOG_ERROR, "invalid depth\n");
......
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