comparison mpeg12.c @ 1946:f9212b59a802 libavcodec

fix exported motion vectors
author michael
date Sun, 18 Apr 2004 17:46:52 +0000
parents e2501e6e7ff7
children d10578f7fd40
comparison
equal deleted inserted replaced
1945:32f68745c431 1946:f9212b59a802
2332 2332
2333 for(i=0; i<2; i++){ 2333 for(i=0; i<2; i++){
2334 for(dir=0; dir<2; dir++){ 2334 for(dir=0; dir<2; dir++){
2335 if (s->mb_intra || (dir==1 && s->pict_type != B_TYPE)) { 2335 if (s->mb_intra || (dir==1 && s->pict_type != B_TYPE)) {
2336 motion_x = motion_y = 0; 2336 motion_x = motion_y = 0;
2337 }else if (s->mv_type == MV_TYPE_16X16){ 2337 }else if (s->mv_type == MV_TYPE_16X16 || (s->mv_type == MV_TYPE_FIELD && field_pic)){
2338 motion_x = s->mv[dir][0][0]; 2338 motion_x = s->mv[dir][0][0];
2339 motion_y = s->mv[dir][0][1]; 2339 motion_y = s->mv[dir][0][1];
2340 } else /*if ((s->mv_type == MV_TYPE_FIELD) || (s->mv_type == MV_TYPE_16X8))*/ { 2340 } else /*if ((s->mv_type == MV_TYPE_FIELD) || (s->mv_type == MV_TYPE_16X8))*/ {
2341 motion_x = s->mv[dir][i][0]; 2341 motion_x = s->mv[dir][i][0];
2342 motion_y = s->mv[dir][i][1]; 2342 motion_y = s->mv[dir][i][1];