diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-17 16:47:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-17 16:47:18 +0200 |
| commit | 19769766740bf4932c7920ca61d4df41e0610083 (patch) | |
| tree | 6f1cb56ef5549e7442692f062a12e74457c71a1d /libavcodec/eacmv.c | |
| parent | 8fc441cee89cb3af5026facd7fc622074747e223 (diff) | |
| parent | ea78a348d86a3a733f6c1e0a65cfdd8283d924b9 (diff) | |
Merge commit 'ea78a348d86a3a733f6c1e0a65cfdd8283d924b9'
* commit 'ea78a348d86a3a733f6c1e0a65cfdd8283d924b9':
eacmv: Make sure a reference frame exists before referencing it
Conflicts:
libavcodec/eacmv.c
See: 113d7be62497c4e59db8f224fdb7f0a90cf17d03
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/eacmv.c')
| -rw-r--r-- | libavcodec/eacmv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/eacmv.c b/libavcodec/eacmv.c index 4e96c1af49..31b9b0d059 100644 --- a/libavcodec/eacmv.c +++ b/libavcodec/eacmv.c @@ -123,8 +123,8 @@ static void cmv_decode_inter(CmvContext *s, AVFrame *frame, const uint8_t *buf, int yoffset = ((buf[i] >> 4)) - 7; if (s->last_frame->data[0]) cmv_motcomp(frame->data[0], 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); + s->last_frame->data[0], s->last_frame->linesize[0], + x*4, y*4, xoffset, yoffset, s->avctx->width, s->avctx->height); } i++; } |