Revision 8badb23e libavcodec/interplayvideo.c

View differences:

libavcodec/interplayvideo.c
67 67
    const unsigned char *buf;
68 68
    int size;
69 69

  
70
    int is_16bpp;
70 71
    const unsigned char *stream_ptr;
71 72
    const unsigned char *stream_end;
72 73
    unsigned char *pixel_ptr;
......
620 621
        return -1;
621 622
    }
622 623

  
623
    avctx->pix_fmt = PIX_FMT_PAL8;
624
    s->is_16bpp = avctx->bits_per_coded_sample == 16;
625
    avctx->pix_fmt = s->is_16bpp ? PIX_FMT_RGB555 : PIX_FMT_PAL8;
626
    if (s->is_16bpp) {
627
        av_log(avctx, AV_LOG_ERROR, "16-bit Interplay video is not supported yet.\n");
628
        return -1;
629
    }
624 630
    dsputil_init(&s->dsp, avctx);
625 631

  
626 632
    /* decoding map contains 4 bits of information per 8x8 block */

Also available in: Unified diff