Mercurial > libavcodec.hg
comparison mpeg12.c @ 1938:e2501e6e7ff7 libavcodec
unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
minor +-1 bugfix
| author | michael |
|---|---|
| date | Fri, 16 Apr 2004 01:01:45 +0000 |
| parents | 284fb24da44d |
| children | f9212b59a802 |
comparison
equal
deleted
inserted
replaced
| 1937:4d91a9342d95 | 1938:e2501e6e7ff7 |
|---|---|
| 2322 dprintf("ret=%d\n", ret); | 2322 dprintf("ret=%d\n", ret); |
| 2323 if (ret < 0) | 2323 if (ret < 0) |
| 2324 return -1; | 2324 return -1; |
| 2325 | 2325 |
| 2326 if(s->current_picture.motion_val[0] && !s->encoding){ //note motion_val is normally NULL unless we want to extract the MVs | 2326 if(s->current_picture.motion_val[0] && !s->encoding){ //note motion_val is normally NULL unless we want to extract the MVs |
| 2327 const int wrap = field_pic ? 2*s->block_wrap[0] : s->block_wrap[0]; | 2327 const int wrap = field_pic ? 2*s->b8_stride : s->b8_stride; |
| 2328 int xy = s->mb_x*2 + 1 + (s->mb_y*2 +1)*wrap; | 2328 int xy = s->mb_x*2 + s->mb_y*2*wrap; |
| 2329 int motion_x, motion_y, dir, i; | 2329 int motion_x, motion_y, dir, i; |
| 2330 if(field_pic && !s->first_field) | 2330 if(field_pic && !s->first_field) |
| 2331 xy += wrap/2; | 2331 xy += wrap/2; |
| 2332 | 2332 |
| 2333 for(i=0; i<2; i++){ | 2333 for(i=0; i<2; i++){ |
