Revision da452aca

View differences:

libavcodec/h264.h
947 947
    }
948 948

  
949 949
#if 1
950
    if(IS_INTER(mb_type) || IS_DIRECT(mb_type)){
950
    if(IS_INTER(mb_type) || (IS_DIRECT(mb_type) && h->direct_spatial_mv_pred)){
951 951
        int list;
952 952
        for(list=0; list<h->list_count; list++){
953 953
            if(!USES_LIST(mb_type, list) && !IS_DIRECT(mb_type)){
......
958 958
                }*/
959 959
                continue;
960 960
            }
961
            assert(!(IS_DIRECT(mb_type) && !h->direct_spatial_mv_pred));
962

  
961 963
            h->mv_cache_clean[list]= 0;
962 964

  
963 965
            if(USES_LIST(top_type, list)){
......
990 992
                }
991 993
            }
992 994

  
993
            if((IS_DIRECT(mb_type) && !h->direct_spatial_mv_pred))
994
                continue;
995

  
996 995
            if(USES_LIST(topleft_type, list)){
997 996
                const int b_xy = h->mb2b_xy[topleft_xy] + 3 + h->b_stride + (topleft_partition & 2*h->b_stride);
998 997
                const int b8_xy= h->mb2b8_xy[topleft_xy] + 1 + (topleft_partition & h->b8_stride);

Also available in: Unified diff