Mercurial > libavcodec.hg
changeset 758:cca620e89cf0 libavcodec
fixing h263 slice decoding (again)
| author | michaelni |
|---|---|
| date | Sat, 19 Oct 2002 23:48:08 +0000 |
| parents | d031d1575ceb |
| children | 21b506d700cc |
| files | h263dec.c |
| diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/h263dec.c Sat Oct 19 11:03:13 2002 +0000 +++ b/h263dec.c Sat Oct 19 23:48:08 2002 +0000 @@ -204,7 +204,7 @@ if(ret<0){ const int xy= s->mb_x + s->mb_y*s->mb_width; if(ret==SLICE_END){ -//printf("%d %d %06X\n", s->mb_x, s->gb.size*8 - get_bits_count(&s->gb), show_bits(&s->gb, 24)); +//printf("%d %d %d %06X\n", s->mb_x, s->mb_y, s->gb.size*8 - get_bits_count(&s->gb), show_bits(&s->gb, 24)); s->error_status_table[xy]|= AC_END; if(!s->partitioned_frame) s->error_status_table[xy]|= MV_END|DC_END; @@ -420,13 +420,13 @@ avctx->aspected_height = s->aspected_height; } - if (s->codec_id==CODEC_ID_H263 && s->codec_id==CODEC_ID_H263) - s->gob_index = ff_h263_get_gob_height(s); - if (MPV_common_init(s) < 0) return -1; } - + + if((s->codec_id==CODEC_ID_H263 || s->codec_id==CODEC_ID_H263P)) + s->gob_index = ff_h263_get_gob_height(s); + if(ret==FRAME_SKIPED) return get_consumed_bytes(s, buf_size); /* skip if the header was thrashed */ if (ret < 0){