From 35aa136a77772b69fa9857820be2352189e81c80 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 19 Oct 2002 23:48:08 +0000 Subject: [PATCH] fixing h263 slice decoding (again) Originally committed as revision 1051 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/h263dec.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 77eda7bb0b..b8ea14c34c 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -204,7 +204,7 @@ static int decode_slice(MpegEncContext *s){ 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 @@ uint64_t time= rdtsc(); 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){