Browse Source

eacmv: ensure second-last frame is allocated before referencing it

Fixes issue2513
Original patch by Daniel Kang, daniel.d.kang at gmail

Originally committed as revision 26279 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/n0.8
Daniel Kang Peter Ross 14 years ago
parent
commit
062421e30d
1 changed files with 1 additions and 0 deletions
  1. +1
    -0
      libavcodec/eacmv.c

+ 1
- 0
libavcodec/eacmv.c View File

@@ -97,6 +97,7 @@ static void cmv_decode_inter(CmvContext * s, const uint8_t *buf, const uint8_t *
}else if(raw<buf_end) { /* inter using second-last frame as reference */ }else if(raw<buf_end) { /* inter using second-last frame as reference */
int xoffset = (*raw & 0xF) - 7; int xoffset = (*raw & 0xF) - 7;
int yoffset = ((*raw >> 4)) - 7; int yoffset = ((*raw >> 4)) - 7;
if (s->last2_frame.data[0])
cmv_motcomp(s->frame.data[0], s->frame.linesize[0], cmv_motcomp(s->frame.data[0], s->frame.linesize[0],
s->last2_frame.data[0], s->last2_frame.linesize[0], s->last2_frame.data[0], s->last2_frame.linesize[0],
x*4, y*4, xoffset, yoffset, s->avctx->width, s->avctx->height); x*4, y*4, xoffset, yoffset, s->avctx->width, s->avctx->height);


Loading…
Cancel
Save