Browse Source

Change iv_decode_frame to get AVCodecContext as argument, so that

avcodec_check_dimensions can be called with a proper context instead of NULL.

Originally committed as revision 19358 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.6
Reimar Döffinger 16 years ago
parent
commit
28bcc76ab7
1 changed files with 4 additions and 3 deletions
  1. +4
    -3
      libavcodec/indeo3.c

+ 4
- 3
libavcodec/indeo3.c View File

@@ -975,9 +975,10 @@ static av_cold int indeo3_decode_init(AVCodecContext *avctx)
return ret; return ret;
} }


static int iv_decode_frame(Indeo3DecodeContext *s,
static int iv_decode_frame(AVCodecContext *avctx,
const uint8_t *buf, int buf_size) const uint8_t *buf, int buf_size)
{ {
Indeo3DecodeContext *s = avctx->priv_data;
unsigned int image_width, image_height, unsigned int image_width, image_height,
chroma_width, chroma_height; chroma_width, chroma_height;
unsigned long flags, cb_offset, data_size, unsigned long flags, cb_offset, data_size,
@@ -994,7 +995,7 @@ static int iv_decode_frame(Indeo3DecodeContext *s,
image_height = bytestream_get_le16(&buf_pos); image_height = bytestream_get_le16(&buf_pos);
image_width = bytestream_get_le16(&buf_pos); image_width = bytestream_get_le16(&buf_pos);


if(avcodec_check_dimensions(NULL, image_width, image_height))
if(avcodec_check_dimensions(avctx, image_width, image_height))
return -1; return -1;


chroma_height = ((image_height >> 2) + 3) & 0x7ffc; chroma_height = ((image_height >> 2) + 3) & 0x7ffc;
@@ -1070,7 +1071,7 @@ static int indeo3_decode_frame(AVCodecContext *avctx,
uint8_t *src, *dest; uint8_t *src, *dest;
int y; int y;


if (iv_decode_frame(s, buf, buf_size) < 0)
if (iv_decode_frame(avctx, buf, buf_size) < 0)
return -1; return -1;


if(s->frame.data[0]) if(s->frame.data[0])


Loading…
Cancel
Save