comparison h263dec.c @ 758:cca620e89cf0 libavcodec

fixing h263 slice decoding (again)

757:d031d1575ceb

            MPV_decode_mb(s, s->block);

            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));
                    s->error_status_table[xy]|= AC_END;
                    if(!s->partitioned_frame)
                        s->error_status_table[xy]|= MV_END|DC_END;

                    s->padding_bug_score--;

	{
	    avctx->aspected_width = s->aspected_width;
	    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(ret==FRAME_SKIPED) return get_consumed_bytes(s, buf_size);
    /* skip if the header was thrashed */
    if (ret < 0){
        fprintf(stderr, "header damaged\n");
        return -1;

758:cca620e89cf0

            MPV_decode_mb(s, s->block);

            if(ret<0){
                const int xy= s->mb_x + s->mb_y*s->mb_width;
                if(ret==SLICE_END){
//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;

                    s->padding_bug_score--;

	{
	    avctx->aspected_width = s->aspected_width;
	    avctx->aspected_height = s->aspected_height;
	}

        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){
        fprintf(stderr, "header damaged\n");
        return -1;