From 2e3be0fba911d0567b2c501640ad2f3fa85233cb Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 18 Mar 2002 20:11:43 +0000 Subject: [PATCH] fixing 4MV Originally committed as revision 338 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/h263.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/h263.c b/libavcodec/h263.c index 9ad3684..d68240b 100644 --- a/libavcodec/h263.c +++ b/libavcodec/h263.c @@ -555,7 +555,7 @@ INT16 *h263_pred_motion(MpegEncContext * s, int block, mot_val = s->motion_val[xy]; /* special case for first line */ - if (s->mb_y == 0 || s->first_slice_line || s->first_gob_line) { + if ((s->mb_y == 0 || s->first_slice_line || s->first_gob_line) && block<2) { A = s->motion_val[xy - 1]; *px = A[0]; *py = A[1]; @@ -2353,6 +2353,7 @@ int mpeg4_decode_picture_header(MpegEncContext * s) //printf("b-code %d\n", s->b_code); } //printf("quant:%d fcode:%d\n", s->qscale, s->f_code); + if(!s->scalability){ if (s->shape!=RECT_SHAPE && s->pict_type!=I_TYPE) { skip_bits1(&s->gb); // vop shape coding type -- 2.7.4