From a0eb8de5e01a6401c3b310b5221ab7c3bc485f12 Mon Sep 17 00:00:00 2001 From: Reimar Döffinger Date: Sun, 22 Jan 2012 13:17:53 +0100 Subject: Merge palette-only header with actual video frame. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes the video frame pts (off by one for each MVIh) and makes the "key frames" decode stand-alone (MVIh contains only palette, such a palette-only frame being marked as key frame is not really correct). Signed-off-by: Reimar Döffinger --- libavcodec/eacmv.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'libavcodec/eacmv.c') diff --git a/libavcodec/eacmv.c b/libavcodec/eacmv.c index 8a8d6a9cef..82ec9fc9fc 100644 --- a/libavcodec/eacmv.c +++ b/libavcodec/eacmv.c @@ -162,8 +162,11 @@ static int cmv_decode_frame(AVCodecContext *avctx, return AVERROR_INVALIDDATA; if (AV_RL32(buf)==MVIh_TAG||AV_RB32(buf)==MVIh_TAG) { + unsigned size = AV_RL32(buf + 4); cmv_process_header(s, buf+EA_PREAMBLE_SIZE, buf_end); - return buf_size; + if (size > buf_end - buf - EA_PREAMBLE_SIZE) + return -1; + buf += size; } if (av_image_check_size(s->width, s->height, 0, s->avctx)) -- cgit v1.2.3