Revision 82fb5bb2 libavcodec/h264.h

View differences:

libavcodec/h264.h
811 811
    h->left_mb_xy[0] = left_xy[0];
812 812
    h->left_mb_xy[1] = left_xy[1];
813 813
    //FIXME do we need all in the context?
814
    h->topleft_type = h->slice_table[topleft_xy ] == h->slice_num ? s->current_picture.mb_type[topleft_xy] : 0;
815
    h->top_type     = h->slice_table[top_xy     ] == h->slice_num ? s->current_picture.mb_type[top_xy]     : 0;
816
    h->topright_type= h->slice_table[topright_xy] == h->slice_num ? s->current_picture.mb_type[topright_xy]: 0;
817
    h->left_type[0] = h->slice_table[left_xy[0] ] == h->slice_num ? s->current_picture.mb_type[left_xy[0]] : 0;
818
    h->left_type[1] = h->slice_table[left_xy[1] ] == h->slice_num ? s->current_picture.mb_type[left_xy[1]] : 0;
814

  
815
    h->topleft_type = s->current_picture.mb_type[topleft_xy] ;
816
    h->top_type     = s->current_picture.mb_type[top_xy]     ;
817
    h->topright_type= s->current_picture.mb_type[topright_xy];
818
    h->left_type[0] = s->current_picture.mb_type[left_xy[0]] ;
819
    h->left_type[1] = s->current_picture.mb_type[left_xy[1]] ;
820

  
821
    if(h->slice_table[topleft_xy ] != h->slice_num) h->topleft_type = 0;
822
    if(h->slice_table[top_xy     ] != h->slice_num) h->top_type     = 0;
823
    if(h->slice_table[topright_xy] != h->slice_num) h->topright_type= 0;
824
    if(h->slice_table[left_xy[0] ] != h->slice_num) h->left_type[0] = 0;
825
    if(h->slice_table[left_xy[1] ] != h->slice_num) h->left_type[1] = 0;
819 826
}
820 827

  
821 828
static void fill_decode_caches(H264Context *h, int mb_type){

Also available in: Unified diff