Revision ce5e49b0 libavcodec/mpegvideo_common.h

View differences:

libavcodec/mpegvideo_common.h
649 649

  
650 650
    prefetch_motion(s, ref_picture, dir);
651 651

  
652
    if(!is_mpeg12 && s->obmc && s->pict_type != FF_B_TYPE){
652
    if(!is_mpeg12 && s->obmc && s->pict_type != AV_PICTURE_TYPE_B){
653 653
        int16_t mv_cache[4][4][2];
654 654
        const int xy= s->mb_x + s->mb_y*s->mb_stride;
655 655
        const int mot_stride= s->b8_stride;
......
816 816
                            s->mv[dir][1][0], s->mv[dir][1][1], 8, mb_y);
817 817
            }
818 818
        } else {
819
            if(s->picture_structure != s->field_select[dir][0] + 1 && s->pict_type != FF_B_TYPE && !s->first_field){
819
            if(s->picture_structure != s->field_select[dir][0] + 1 && s->pict_type != AV_PICTURE_TYPE_B && !s->first_field){
820 820
                ref_picture= s->current_picture_ptr->data;
821 821
            }
822 822

  
......
831 831
            uint8_t ** ref2picture;
832 832

  
833 833
            if(s->picture_structure == s->field_select[dir][i] + 1
834
               || s->pict_type == FF_B_TYPE || s->first_field){
834
               || s->pict_type == AV_PICTURE_TYPE_B || s->first_field){
835 835
                ref2picture= ref_picture;
836 836
            }else{
837 837
                ref2picture= s->current_picture_ptr->data;

Also available in: Unified diff