Unified · Split
| @@ -409,6 +409,7 @@ static int msmpeg4v2_decode_motion(MpegEncContext * s, int pred, int f_code) · 408 unmodified lines | |||
| 409 | static int msmpeg4v12_decode_mb(MpegEncContext *s, DCTELEM block[6][64]) | 409 | static int msmpeg4v12_decode_mb(MpegEncContext *s, DCTELEM block[6][64]) |
| 410 | { | 410 | { |
| 411 | int cbp, code, i; | 411 | int cbp, code, i; |
| 412 | uint32_t * const mb_type_ptr = &s->current_picture.f.mb_type[s->mb_x + s->mb_y*s->mb_stride]; | ||
| 412 | 413 | ||
| 413 | if (s->pict_type == AV_PICTURE_TYPE_P) { | 414 | if (s->pict_type == AV_PICTURE_TYPE_P) { |
| 414 | if (s->use_skip_mb_code) { | 415 | if (s->use_skip_mb_code) { |
| @@ -422,6 +423,7 @@ static int msmpeg4v12_decode_mb(MpegEncContext *s, DCTELEM block[6][64]) · 7 unmodified lines | |||
| 422 | s->mv[0][0][0] = 0; | 423 | s->mv[0][0][0] = 0; |
| 423 | s->mv[0][0][1] = 0; | 424 | s->mv[0][0][1] = 0; |
| 424 | s->mb_skipped = 1; | 425 | s->mb_skipped = 1; |
| 426 | *mb_type_ptr = MB_TYPE_SKIP | MB_TYPE_L0 | MB_TYPE_16x16; | ||
| 425 | return 0; | 427 | return 0; |
| 426 | } | 428 | } |
| 427 | } | 429 | } |
| @@ -470,6 +472,7 @@ static int msmpeg4v12_decode_mb(MpegEncContext *s, DCTELEM block[6][64]) · 42 unmodified lines | |||
| 470 | s->mv_type = MV_TYPE_16X16; | 472 | s->mv_type = MV_TYPE_16X16; |
| 471 | s->mv[0][0][0] = mx; | 473 | s->mv[0][0][0] = mx; |
| 472 | s->mv[0][0][1] = my; | 474 | s->mv[0][0][1] = my; |
| 475 | *mb_type_ptr = MB_TYPE_L0 | MB_TYPE_16x16; | ||
| 473 | } else { | 476 | } else { |
| 474 | if(s->msmpeg4_version==2){ | 477 | if(s->msmpeg4_version==2){ |
| 475 | s->ac_pred = get_bits1(&s->gb); | 478 | s->ac_pred = get_bits1(&s->gb); |
| @@ -479,6 +482,7 @@ static int msmpeg4v12_decode_mb(MpegEncContext *s, DCTELEM block[6][64]) · 3 unmodified lines | |||
| 479 | cbp|= get_vlc2(&s->gb, ff_h263_cbpy_vlc.table, CBPY_VLC_BITS, 1)<<2; //FIXME check errors | 482 | cbp|= get_vlc2(&s->gb, ff_h263_cbpy_vlc.table, CBPY_VLC_BITS, 1)<<2; //FIXME check errors |
| 480 | if(s->pict_type==AV_PICTURE_TYPE_P) cbp^=0x3C; | 483 | if(s->pict_type==AV_PICTURE_TYPE_P) cbp^=0x3C; |
| 481 | } | 484 | } |
| 485 | *mb_type_ptr = MB_TYPE_INTRA; | ||
| 482 | } | 486 | } |
| 483 | 487 | ||
| 484 | s->dsp.clear_blocks(s->block[0]); | 488 | s->dsp.clear_blocks(s->block[0]); |