diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2003-12-10 02:34:09 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2003-12-10 02:34:09 +0000 |
| commit | 26f548a7a6d644474657adc5aa3c8ac649073b1b (patch) | |
| tree | c9566557e70c114ed5f6990c841d07b1210866ce | |
| parent | 27a206e031857f2f60dad17420a744e8f106b26b (diff) | |
| download | ffmpeg-26f548a7a6d644474657adc5aa3c8ac649073b1b.tar.gz | |
MB_TYPE_INTERLACED info fix
Originally committed as revision 2586 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/mpeg12.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 2be9e8a380..ca3327cf5a 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -1170,7 +1170,7 @@ static int mpeg_decode_mb(MpegEncContext *s, } } else { /* MT_16X8 */ - mb_type |= MB_TYPE_16x8; + mb_type |= MB_TYPE_16x8 | MB_TYPE_INTERLACED; s->mv_type = MV_TYPE_16X8; for(j=0;j<2;j++) { s->field_select[i][j] = get_bits1(&s->gb); @@ -1201,7 +1201,7 @@ static int mpeg_decode_mb(MpegEncContext *s, dprintf("fmy=%d\n", val); } } else { - mb_type |= MB_TYPE_16x16; + mb_type |= MB_TYPE_16x16 | MB_TYPE_INTERLACED; s->field_select[i][0] = get_bits1(&s->gb); for(k=0;k<2;k++) { val = mpeg_decode_motion(s, s->mpeg_f_code[i][k], @@ -1259,6 +1259,9 @@ static int mpeg_decode_mb(MpegEncContext *s, } } break; + default: + av_log(s->avctx, AV_LOG_ERROR, "00 motion_type at %d %d\n", s->mb_x, s->mb_y); + return -1; } } } |