Revision ce5e49b0 libavcodec/h264_cavlc.c

View differences:

libavcodec/h264_cavlc.c
548 548
    tprintf(s->avctx, "pic:%d mb:%d/%d\n", h->frame_num, s->mb_x, s->mb_y);
549 549
    cbp = 0; /* avoid warning. FIXME: find a solution without slowing
550 550
                down the code */
551
    if(h->slice_type_nos != FF_I_TYPE){
551
    if(h->slice_type_nos != AV_PICTURE_TYPE_I){
552 552
        if(s->mb_skip_run==-1)
553 553
            s->mb_skip_run= get_ue_golomb(&s->gb);
554 554

  
......
569 569
    h->prev_mb_skipped= 0;
570 570

  
571 571
    mb_type= get_ue_golomb(&s->gb);
572
    if(h->slice_type_nos == FF_B_TYPE){
572
    if(h->slice_type_nos == AV_PICTURE_TYPE_B){
573 573
        if(mb_type < 23){
574 574
            partition_count= b_mb_type_info[mb_type].partition_count;
575 575
            mb_type=         b_mb_type_info[mb_type].type;
......
577 577
            mb_type -= 23;
578 578
            goto decode_intra_mb;
579 579
        }
580
    }else if(h->slice_type_nos == FF_P_TYPE){
580
    }else if(h->slice_type_nos == AV_PICTURE_TYPE_P){
581 581
        if(mb_type < 5){
582 582
            partition_count= p_mb_type_info[mb_type].partition_count;
583 583
            mb_type=         p_mb_type_info[mb_type].type;
......
586 586
            goto decode_intra_mb;
587 587
        }
588 588
    }else{
589
       assert(h->slice_type_nos == FF_I_TYPE);
590
        if(h->slice_type == FF_SI_TYPE && mb_type)
589
       assert(h->slice_type_nos == AV_PICTURE_TYPE_I);
590
        if(h->slice_type == AV_PICTURE_TYPE_SI && mb_type)
591 591
            mb_type--;
592 592
decode_intra_mb:
593 593
        if(mb_type > 25){
......
678 678
    }else if(partition_count==4){
679 679
        int i, j, sub_partition_count[4], list, ref[2][4];
680 680

  
681
        if(h->slice_type_nos == FF_B_TYPE){
681
        if(h->slice_type_nos == AV_PICTURE_TYPE_B){
682 682
            for(i=0; i<4; i++){
683 683
                h->sub_mb_type[i]= get_ue_golomb_31(&s->gb);
684 684
                if(h->sub_mb_type[i] >=13){
......
696 696
                h->ref_cache[1][scan8[12]] = PART_NOT_AVAILABLE;
697 697
            }
698 698
        }else{
699
            assert(h->slice_type_nos == FF_P_TYPE); //FIXME SP correct ?
699
            assert(h->slice_type_nos == AV_PICTURE_TYPE_P); //FIXME SP correct ?
700 700
            for(i=0; i<4; i++){
701 701
                h->sub_mb_type[i]= get_ue_golomb_31(&s->gb);
702 702
                if(h->sub_mb_type[i] >=4){

Also available in: Unified diff