From 8badb23e2264caab249dc2758f0bd0a43f423a96 Mon Sep 17 00:00:00 2001 From: Kostya Shishkov Date: Sun, 27 Dec 2009 08:21:40 +0000 Subject: Recognize 16-bit Interplay Video variant Originally committed as revision 20927 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/interplayvideo.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'libavcodec/interplayvideo.c') diff --git a/libavcodec/interplayvideo.c b/libavcodec/interplayvideo.c index b3a43bdd34..9f6b833bb1 100644 --- a/libavcodec/interplayvideo.c +++ b/libavcodec/interplayvideo.c @@ -67,6 +67,7 @@ typedef struct IpvideoContext { const unsigned char *buf; int size; + int is_16bpp; const unsigned char *stream_ptr; const unsigned char *stream_end; unsigned char *pixel_ptr; @@ -620,7 +621,12 @@ static av_cold int ipvideo_decode_init(AVCodecContext *avctx) return -1; } - avctx->pix_fmt = PIX_FMT_PAL8; + s->is_16bpp = avctx->bits_per_coded_sample == 16; + avctx->pix_fmt = s->is_16bpp ? PIX_FMT_RGB555 : PIX_FMT_PAL8; + if (s->is_16bpp) { + av_log(avctx, AV_LOG_ERROR, "16-bit Interplay video is not supported yet.\n"); + return -1; + } dsputil_init(&s->dsp, avctx); /* decoding map contains 4 bits of information per 8x8 block */ -- cgit v1.2.3