diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2003-12-04 18:34:47 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2003-12-04 18:34:47 +0000 |
| commit | b40cd4e0e42d66195fef881e21832ba92a771cd5 (patch) | |
| tree | 7bc576994e21a4ea8f4249713888c94a20a085ff /libavcodec/mpeg12.c | |
| parent | 6952f12338a947a048a5cd5ca553aad4269aa7f3 (diff) | |
rv20 (h263) b frame decoding support
Originally committed as revision 2561 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpeg12.c')
| -rw-r--r-- | libavcodec/mpeg12.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 1977f941d8..ed8127682b 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -1109,7 +1109,7 @@ static int mpeg_decode_mb(MpegEncContext *s, } } else { if (mb_type & MB_TYPE_ZERO_MV){ - assert(mb_type & MB_TYPE_PAT); + assert(mb_type & MB_TYPE_CBP); /* compute dct type */ if (s->picture_structure == PICT_FRAME && //FIXME add a interlaced_dct coded var? @@ -1140,7 +1140,7 @@ static int mpeg_decode_mb(MpegEncContext *s, /* compute dct type */ if (s->picture_structure == PICT_FRAME && //FIXME add a interlaced_dct coded var? - !s->frame_pred_frame_dct && IS_PAT(mb_type)) { + !s->frame_pred_frame_dct && HAS_CBP(mb_type)) { s->interlaced_dct = get_bits1(&s->gb); } @@ -1266,7 +1266,7 @@ static int mpeg_decode_mb(MpegEncContext *s, s->mb_intra = 0; - if (IS_PAT(mb_type)) { + if (HAS_CBP(mb_type)) { cbp = get_vlc2(&s->gb, mb_pat_vlc.table, MB_PAT_VLC_BITS, 1); if (cbp < 0){ av_log(s->avctx, AV_LOG_ERROR, "invalid cbp at %d %d\n", s->mb_x, s->mb_y); |