Merge commit 'ea78a348d86a3a733f6c1e0a65cfdd8283d924b9'

* commit 'ea78a348d86a3a733f6c1e0a65cfdd8283d924b9': eacmv: Make sure a reference frame exists before referencing it Conflicts: libavcodec/eacmv.c

Michael Niedermayer committed 13 years ago

Commit 19769762 parents 8fc441c ea78a341 file · +2 −2Browse files

Unified · Split

@@ -123,8 +123,8 @@ static void cmv_decode_inter(CmvContext s, AVFrame frame, const uint8_t *buf, · 122 unmodified lines
123	123	int yoffset = ((buf[i] >> 4)) - 7;
124	124	if (s->last_frame->data[0])
125	125	cmv_motcomp(frame->data[0], frame->linesize[0],
126		− s->last_frame->data[0], s->last_frame->linesize[0],
127		− x4, y4, xoffset, yoffset, s->avctx->width, s->avctx->height);
	126	+ s->last_frame->data[0], s->last_frame->linesize[0],
	127	+ x4, y4, xoffset, yoffset, s->avctx->width, s->avctx->height);
128	128	}
129	129	i++;
130	130	}

Keyboard shortcuts