Commit ed3ba318 authored by michael's avatar michael

MB_TYPE_INTERLACED info fix


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@2586 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent b7809958
...@@ -1170,7 +1170,7 @@ static int mpeg_decode_mb(MpegEncContext *s, ...@@ -1170,7 +1170,7 @@ static int mpeg_decode_mb(MpegEncContext *s,
} }
} else { } else {
/* MT_16X8 */ /* MT_16X8 */
mb_type |= MB_TYPE_16x8; mb_type |= MB_TYPE_16x8 | MB_TYPE_INTERLACED;
s->mv_type = MV_TYPE_16X8; s->mv_type = MV_TYPE_16X8;
for(j=0;j<2;j++) { for(j=0;j<2;j++) {
s->field_select[i][j] = get_bits1(&s->gb); s->field_select[i][j] = get_bits1(&s->gb);
...@@ -1201,7 +1201,7 @@ static int mpeg_decode_mb(MpegEncContext *s, ...@@ -1201,7 +1201,7 @@ static int mpeg_decode_mb(MpegEncContext *s,
dprintf("fmy=%d\n", val); dprintf("fmy=%d\n", val);
} }
} else { } else {
mb_type |= MB_TYPE_16x16; mb_type |= MB_TYPE_16x16 | MB_TYPE_INTERLACED;
s->field_select[i][0] = get_bits1(&s->gb); s->field_select[i][0] = get_bits1(&s->gb);
for(k=0;k<2;k++) { for(k=0;k<2;k++) {
val = mpeg_decode_motion(s, s->mpeg_f_code[i][k], val = mpeg_decode_motion(s, s->mpeg_f_code[i][k],
...@@ -1259,6 +1259,9 @@ static int mpeg_decode_mb(MpegEncContext *s, ...@@ -1259,6 +1259,9 @@ static int mpeg_decode_mb(MpegEncContext *s,
} }
} }
break; break;
default:
av_log(s->avctx, AV_LOG_ERROR, "00 motion_type at %d %d\n", s->mb_x, s->mb_y);
return -1;
} }
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment