Mercurial > libavcodec.hg
comparison wmv2.c @ 1668:30746f429df6 libavcodec
move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
cleanups & fixes by me
| author | michael |
|---|---|
| date | Tue, 09 Dec 2003 01:49:56 +0000 |
| parents | ccf7c96a630f |
| children | e2501e6e7ff7 |
comparison
equal
deleted
inserted
replaced
| 1667:720c073661a1 | 1668:30746f429df6 |
|---|---|
| 505 int16_t *A, *B, *C, *mot_val; | 505 int16_t *A, *B, *C, *mot_val; |
| 506 | 506 |
| 507 wrap = s->block_wrap[0]; | 507 wrap = s->block_wrap[0]; |
| 508 xy = s->block_index[0]; | 508 xy = s->block_index[0]; |
| 509 | 509 |
| 510 mot_val = s->motion_val[xy]; | 510 mot_val = s->current_picture.motion_val[0][xy]; |
| 511 | 511 |
| 512 A = s->motion_val[xy - 1]; | 512 A = s->current_picture.motion_val[0][xy - 1]; |
| 513 B = s->motion_val[xy - wrap]; | 513 B = s->current_picture.motion_val[0][xy - wrap]; |
| 514 C = s->motion_val[xy + 2 - wrap]; | 514 C = s->current_picture.motion_val[0][xy + 2 - wrap]; |
| 515 | 515 |
| 516 diff= FFMAX(ABS(A[0] - B[0]), ABS(A[1] - B[1])); | 516 diff= FFMAX(ABS(A[0] - B[0]), ABS(A[1] - B[1])); |
| 517 | 517 |
| 518 if(s->mb_x && !s->first_slice_line && !s->mspel && w->top_left_mv_flag && diff >= 8) | 518 if(s->mb_x && !s->first_slice_line && !s->mspel && w->top_left_mv_flag && diff >= 8) |
| 519 type= get_bits1(&s->gb); | 519 type= get_bits1(&s->gb); |