mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit 'ea78a348d86a3a733f6c1e0a65cfdd8283d924b9'
* commit 'ea78a348d86a3a733f6c1e0a65cfdd8283d924b9':
eacmv: Make sure a reference frame exists before referencing it
Conflicts:
libavcodec/eacmv.c
See: 113d7be624
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
1976976674
|
@ -123,8 +123,8 @@ static void cmv_decode_inter(CmvContext *s, AVFrame *frame, const uint8_t *buf,
|
||||||
int yoffset = ((buf[i] >> 4)) - 7;
|
int yoffset = ((buf[i] >> 4)) - 7;
|
||||||
if (s->last_frame->data[0])
|
if (s->last_frame->data[0])
|
||||||
cmv_motcomp(frame->data[0], frame->linesize[0],
|
cmv_motcomp(frame->data[0], frame->linesize[0],
|
||||||
s->last_frame->data[0], s->last_frame->linesize[0],
|
s->last_frame->data[0], s->last_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);
|
||||||
}
|
}
|
||||||
i++;
|
i++;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue