Revision 137c8468 libavcodec/msmpeg4.c
libavcodec/msmpeg4.c  

449  449 
int xy, wrap, pred, a, b, c; 
450  450  
451  451 
xy = s>block_index[n]; 
452 
wrap = s>block_wrap[0];


452 
wrap = s>b8_stride;


453  453  
454  454 
/* B C 
455  455 
* A X 
...  ...  
567  567  
568  568 
s>misc_bits += get_bits_diff(s); 
569  569  
570 
h263_pred_motion(s, 0, &pred_x, &pred_y); 

570 
h263_pred_motion(s, 0, 0, &pred_x, &pred_y);


571  571 
msmpeg4v2_encode_motion(s, motion_x  pred_x); 
572  572 
msmpeg4v2_encode_motion(s, motion_y  pred_y); 
573  573 
}else{ 
...  ...  
578  578 
s>misc_bits += get_bits_diff(s); 
579  579  
580  580 
/* motion vector */ 
581 
h263_pred_motion(s, 0, &pred_x, &pred_y); 

581 
h263_pred_motion(s, 0, 0, &pred_x, &pred_y);


582  582 
msmpeg4_encode_motion(s, motion_x  pred_x, 
583  583 
motion_y  pred_y); 
584  584 
} 
...  ...  
1549  1549 
cbp= cbpy<<2; 
1550  1550 
if(s>msmpeg4_version==1  (cbp&3) != 3) cbp^= 0x3C; 
1551  1551 

1552 
h263_pred_motion(s, 0, &mx, &my); 

1552 
h263_pred_motion(s, 0, 0, &mx, &my);


1553  1553 
mx= msmpeg4v2_decode_motion(s, mx, 1); 
1554  1554 
my= msmpeg4v2_decode_motion(s, my, 1); 
1555  1555 

...  ...  
1637  1637 
s>rl_chroma_table_index = s>rl_table_index; 
1638  1638 
} 
1639  1639 
set_stat(ST_MV); 
1640 
h263_pred_motion(s, 0, &mx, &my); 

1640 
h263_pred_motion(s, 0, 0, &mx, &my);


1641  1641 
if (msmpeg4_decode_motion(s, &mx, &my) < 0) 
1642  1642 
return 1; 
1643  1643 
s>mv_dir = MV_DIR_FORWARD; 
Also available in: Unified diff