[FFmpeg-cvslog] Fix 32bit sunrast decoding.

Carl Eugen Hoyos git at videolan.org
Fri Mar 9 09:23:54 CET 2012


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Fri Mar  9 09:17:07 2012 +0100| [19e72e0a8d129bedb03188edc16bc26de9f04b12] | committer: Carl Eugen Hoyos

Fix 32bit sunrast decoding.

This patch visually breaks the sample from ticket #895,
but decodes it identically as Gimp, ImageMagick and xview.

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

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

diff --git a/libavcodec/sunrast.c b/libavcodec/sunrast.c
index 7137621..014c96d 100644
--- a/libavcodec/sunrast.c
+++ b/libavcodec/sunrast.c
@@ -105,7 +105,7 @@ static int sunrast_decode_frame(AVCodecContext *avctx, void *data,
             avctx->pix_fmt = (type == RT_FORMAT_RGB) ? PIX_FMT_RGB24 : PIX_FMT_BGR24;
             break;
         case 32:
-            avctx->pix_fmt = (type == RT_FORMAT_RGB) ? PIX_FMT_RGB0 : PIX_FMT_BGR0;
+            avctx->pix_fmt = (type == RT_FORMAT_RGB) ? PIX_FMT_0RGB : PIX_FMT_0BGR;
             break;
         default:
             av_log(avctx, AV_LOG_ERROR, "invalid depth\n");



More information about the ffmpeg-cvslog mailing list