summaryrefslogtreecommitdiff
path: root/libavcodec/lagarith.c
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2013-05-06 22:40:38 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2013-05-07 11:46:35 +0200
commitf381dc1d618611f149da32ab865bfc1b49861fd3 (patch)
treec94fa56fa97bbb216339c6b034c7c488cb65bee8 /libavcodec/lagarith.c
parent9276467bcec5deaa5a3cfa3a064d8f85fcb4099c (diff)
Support decoding of Lagarith frame type FRAME_SOLID_COLOR.
Fixes bug 459.
Diffstat (limited to 'libavcodec/lagarith.c')
-rw-r--r--libavcodec/lagarith.c22
1 files changed, 22 insertions, 0 deletions
diff --git a/libavcodec/lagarith.c b/libavcodec/lagarith.c
index 85997846e4..4285644f67 100644
--- a/libavcodec/lagarith.c
+++ b/libavcodec/lagarith.c
@@ -556,6 +556,28 @@ static int lag_decode_frame(AVCodecContext *avctx,
}
}
break;
+ case FRAME_SOLID_COLOR:
+ if (avctx->bits_per_coded_sample == 24) {
+ avctx->pix_fmt = AV_PIX_FMT_RGB24;
+ } else {
+ avctx->pix_fmt = AV_PIX_FMT_RGB32;
+ offset_gu |= 0xFFU << 24;
+ }
+
+ if ((ret = ff_thread_get_buffer(avctx, &frame,0)) < 0)
+ return ret;
+
+ dst = p->data[0];
+ for (j = 0; j < avctx->height; j++) {
+ for (i = 0; i < avctx->width; i++)
+ if (avctx->bits_per_coded_sample == 24) {
+ AV_WB24(dst + i * 3, offset_gu);
+ } else {
+ AV_WN32(dst + i * 4, offset_gu);
+ }
+ dst += p->linesize[0];
+ }
+ break;
case FRAME_ARITH_RGBA:
avctx->pix_fmt = AV_PIX_FMT_RGB32;
planes = 4;