diff options
| author | Diego Biurrun <diego@biurrun.de> | 2009-02-14 15:37:40 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2009-02-14 15:37:40 +0000 |
| commit | fc2dd7e3defcba84ffe36ddf1452170f85143129 (patch) | |
| tree | 586f919afe784243d05c4c190ebee040391a624f /libavcodec/error_resilience.c | |
| parent | 9e477960489d3296f023c64d6cc43073953aedf3 (diff) | |
| download | ffmpeg-fc2dd7e3defcba84ffe36ddf1452170f85143129.tar.gz | |
Remove redundant CONFIG_XVMC option, CONFIG_MPEG_XVMC_DECODER suffices.
Originally committed as revision 17229 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/error_resilience.c')
| -rw-r--r-- | libavcodec/error_resilience.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c index 8ba9461b4b..d97a96b334 100644 --- a/libavcodec/error_resilience.c +++ b/libavcodec/error_resilience.c @@ -563,7 +563,7 @@ static int is_intra_more_likely(MpegEncContext *s){ if(undamaged_count < 5) return 0; //almost all MBs damaged -> use temporal prediction -#if CONFIG_XVMC +#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 @@ -935,7 +935,7 @@ void ff_er_frame_end(MpegEncContext *s){ }else guess_mv(s); -#if CONFIG_XVMC +#if CONFIG_MPEG_XVMC_DECODER /* the filters below are not XvMC compatible, skip them */ if(s->avctx->xvmc_acceleration) goto ec_clean; #endif @@ -1024,7 +1024,7 @@ void ff_er_frame_end(MpegEncContext *s){ v_block_filter(s, s->current_picture.data[2], s->mb_width , s->mb_height , s->uvlinesize, 0); } -#if CONFIG_XVMC +#if CONFIG_MPEG_XVMC_DECODER ec_clean: #endif /* clean a few tables */ |