1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

Init sub_mb_type cleanly.

Originally committed as revision 21790 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2010-02-13 13:14:07 +00:00
parent 923bcb4048
commit 752cc0dcb2

View File

@ -149,7 +149,7 @@ static void pred_spatial_direct_motion(H264Context * const h, int *mb_type){
const int16_t (*l1mv0)[2], (*l1mv1)[2]; const int16_t (*l1mv0)[2], (*l1mv1)[2];
const int8_t *l1ref0, *l1ref1; const int8_t *l1ref0, *l1ref1;
const int is_b8x8 = IS_8X8(*mb_type); const int is_b8x8 = IS_8X8(*mb_type);
unsigned int sub_mb_type; unsigned int sub_mb_type= MB_TYPE_L0L1;;
int i8, i4; int i8, i4;
int ref[2]; int ref[2];
int mv[2]; int mv[2];
@ -160,7 +160,6 @@ static void pred_spatial_direct_motion(H264Context * const h, int *mb_type){
#define MB_TYPE_16x16_OR_INTRA (MB_TYPE_16x16|MB_TYPE_INTRA4x4|MB_TYPE_INTRA16x16|MB_TYPE_INTRA_PCM) #define MB_TYPE_16x16_OR_INTRA (MB_TYPE_16x16|MB_TYPE_INTRA4x4|MB_TYPE_INTRA16x16|MB_TYPE_INTRA_PCM)
*mb_type |= MB_TYPE_L0L1; *mb_type |= MB_TYPE_L0L1;
sub_mb_type |= MB_TYPE_L0L1;
/* ref = min(neighbors) */ /* ref = min(neighbors) */
for(list=0; list<2; list++){ for(list=0; list<2; list++){