Revision ce5e49b0 libavcodec/motion_est.c

View differences:

libavcodec/motion_est.c
1893 1893
                            continue;
1894 1894

  
1895 1895
                    for(j=0; j<fcode && j<8; j++){
1896
                        if(s->pict_type==FF_B_TYPE || s->current_picture.mc_mb_var[xy] < s->current_picture.mb_var[xy])
1896
                        if(s->pict_type==AV_PICTURE_TYPE_B || s->current_picture.mc_mb_var[xy] < s->current_picture.mb_var[xy])
1897 1897
                            score[j]-= 170;
1898 1898
                    }
1899 1899
                }
......
1925 1925
    MotionEstContext * const c= &s->me;
1926 1926
    const int f_code= s->f_code;
1927 1927
    int y, range;
1928
    assert(s->pict_type==FF_P_TYPE);
1928
    assert(s->pict_type==AV_PICTURE_TYPE_P);
1929 1929

  
1930 1930
    range = (((s->out_format == FMT_MPEG1 || s->msmpeg4_version) ? 8 : 16) << f_code);
1931 1931

  

Also available in: Unified diff