diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2002-03-18 20:11:43 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2002-03-18 20:11:43 +0000 |
| commit | 2e3be0fba911d0567b2c501640ad2f3fa85233cb (patch) | |
| tree | 2e3f9eb6ab328f892773da00b3c91c9e5fe6895f | |
| parent | bd31a7750f5c7bd9d2aff426566cfc9f40fa07b6 (diff) | |
| download | ffmpeg-2e3be0fba911d0567b2c501640ad2f3fa85233cb.tar.gz | |
fixing 4MV
Originally committed as revision 338 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/h263.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/h263.c b/libavcodec/h263.c index 9ad3684af8..d68240bc72 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 |