comparison error_resilience.c @ 8832:3eaabd9c4371 libavcodec

Remove redundant CONFIG_XVMC option, CONFIG_MPEG_XVMC_DECODER suffices.

8831:27616b326d57

            undamaged_count++;
    }

    if(undamaged_count < 5) return 0; //almost all MBs damaged -> use temporal prediction

#if CONFIG_XVMC
    //prevent dsp.sad() check, that requires access to the image
    if(s->avctx->xvmc_acceleration && s->pict_type==FF_I_TYPE) return 1;
#endif

    skip_amount= FFMAX(undamaged_count/50, 1); //check only upto 50 MBs

            }
        }
    }else
        guess_mv(s);

#if CONFIG_XVMC
    /* the filters below are not XvMC compatible, skip them */
    if(s->avctx->xvmc_acceleration) goto ec_clean;
#endif
    /* fill DC for inter blocks */
    for(mb_y=0; mb_y<s->mb_height; mb_y++){

        v_block_filter(s, s->current_picture.data[0], s->mb_width*2, s->mb_height*2, s->linesize  , 1);
        v_block_filter(s, s->current_picture.data[1], s->mb_width  , s->mb_height  , s->uvlinesize, 0);
        v_block_filter(s, s->current_picture.data[2], s->mb_width  , s->mb_height  , s->uvlinesize, 0);
    }

#if CONFIG_XVMC
ec_clean:
#endif
    /* clean a few tables */
    for(i=0; i<s->mb_num; i++){
        const int mb_xy= s->mb_index2xy[i];

8832:3eaabd9c4371

            undamaged_count++;
    }

    if(undamaged_count < 5) return 0; //almost all MBs damaged -> use temporal prediction

#if CONFIG_MPEG_XVMC_DECODER
    //prevent dsp.sad() check, that requires access to the image
    if(s->avctx->xvmc_acceleration && s->pict_type==FF_I_TYPE) return 1;
#endif

    skip_amount= FFMAX(undamaged_count/50, 1); //check only upto 50 MBs

            }
        }
    }else
        guess_mv(s);

#if CONFIG_MPEG_XVMC_DECODER
    /* the filters below are not XvMC compatible, skip them */
    if(s->avctx->xvmc_acceleration) goto ec_clean;
#endif
    /* fill DC for inter blocks */
    for(mb_y=0; mb_y<s->mb_height; mb_y++){

        v_block_filter(s, s->current_picture.data[0], s->mb_width*2, s->mb_height*2, s->linesize  , 1);
        v_block_filter(s, s->current_picture.data[1], s->mb_width  , s->mb_height  , s->uvlinesize, 0);
        v_block_filter(s, s->current_picture.data[2], s->mb_width  , s->mb_height  , s->uvlinesize, 0);
    }

#if CONFIG_MPEG_XVMC_DECODER
ec_clean:
#endif
    /* clean a few tables */
    for(i=0; i<s->mb_num; i++){
        const int mb_xy= s->mb_index2xy[i];