- /* make the palette available */
- memcpy(s->frame.data[1], s->avctx->palctrl->palette, AVPALETTE_SIZE);
- if (s->avctx->palctrl->palette_changed) {
- s->frame.palette_has_changed = 1;
- s->avctx->palctrl->palette_changed = 0;
+ /* FIXME how to correctly detect RLE ??? */
+ if (avctx->height * istride == avpkt->size) { /* assume uncompressed */
+ int linesize = avctx->width * avctx->bits_per_coded_sample / 8;
+ uint8_t *ptr = s->frame->data[0];
+ uint8_t *buf = avpkt->data + (avctx->height-1)*istride;
+ int i, j;
+
+ for (i = 0; i < avctx->height; i++) {
+ if (avctx->bits_per_coded_sample == 4) {
+ for (j = 0; j < avctx->width - 1; j += 2) {
+ ptr[j+0] = buf[j>>1] >> 4;
+ ptr[j+1] = buf[j>>1] & 0xF;
+ }
+ if (avctx->width & 1)
+ ptr[j+0] = buf[j>>1] >> 4;
+ } else {
+ memcpy(ptr, buf, linesize);
+ }
+ buf -= istride;
+ ptr += s->frame->linesize[0];
+ }
+ } else {
+ bytestream2_init(&s->gb, buf, buf_size);
+ ff_msrle_decode(avctx, (AVPicture*)s->frame, avctx->bits_per_coded_sample, &s->gb);