Revision 99344d43 libavcodec/h264.h

View differences:

libavcodec/h264.h
285 285
    int top_mb_xy;
286 286
    int left_mb_xy[2];
287 287

  
288
    int top_type;
289
    int left_type[2];
290

  
288 291
    int8_t intra4x4_pred_mode_cache[5*8];
289 292
    int8_t (*intra4x4_pred_mode)[8];
290 293
    H264PredContext hpc;
......
806 809
               && (top_xy    < s->mb_stride || ((qp + s->current_picture.qscale_table[top_xy    -s->mb_stride] + 1)>>1) <= qp_thresh))
807 810
                return 1;
808 811
        }
812

  
813
        if(h->deblocking_filter == 2){
814
            h->top_type    = top_type     = h->slice_table[top_xy     ] == h->slice_num ? s->current_picture.mb_type[top_xy]     : 0;
815
            h->left_type[0]= left_type[0] = h->slice_table[left_xy[0] ] == h->slice_num ? s->current_picture.mb_type[left_xy[0]] : 0;
816
            h->left_type[1]= left_type[1] = h->slice_table[left_xy[1] ] == h->slice_num ? s->current_picture.mb_type[left_xy[1]] : 0;
817
        }else{
818
            h->top_type    = top_type     = h->slice_table[top_xy     ] < 0xFFFF ? s->current_picture.mb_type[top_xy]     : 0;
819
            h->left_type[0]= left_type[0] = h->slice_table[left_xy[0] ] < 0xFFFF ? s->current_picture.mb_type[left_xy[0]] : 0;
820
            h->left_type[1]= left_type[1] = h->slice_table[left_xy[1] ] < 0xFFFF ? s->current_picture.mb_type[left_xy[1]] : 0;
821
        }
809 822
        if(IS_INTRA(mb_type))
810 823
            return 0;
811 824

  
......
817 830

  
818 831
        h->cbp= h->cbp_table[mb_xy];
819 832

  
820
        top_type     = h->slice_table[top_xy     ] < 0xFFFF ? s->current_picture.mb_type[top_xy]     : 0;
821
        left_type[0] = h->slice_table[left_xy[0] ] < 0xFFFF ? s->current_picture.mb_type[left_xy[0]] : 0;
822
        left_type[1] = h->slice_table[left_xy[1] ] < 0xFFFF ? s->current_picture.mb_type[left_xy[1]] : 0;
823

  
824 833
        {
825 834
            int list;
826 835
            for(list=0; list<h->list_count; list++){

Also available in: Unified diff