diff options
| author | Diego Biurrun <diego@biurrun.de> | 2008-12-15 22:22:51 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2008-12-15 22:22:51 +0000 |
| commit | b24298badc05dddeb87dbe9f12f29842ebec60f3 (patch) | |
| tree | 2db8c35574813b200cfec26775e0f7c02c40de4f /libavcodec/error_resilience.c | |
| parent | 6915cf38542828488b1129e6ce6207d5e5699798 (diff) | |
| download | ffmpeg-b24298badc05dddeb87dbe9f12f29842ebec60f3.tar.gz | |
Switch xvmc over to a CONFIG_ option.
Originally committed as revision 16153 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 f15b0b6cda..55bd716c54 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 -#ifdef HAVE_XVMC +#ifdef 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 @@ -934,7 +934,7 @@ void ff_er_frame_end(MpegEncContext *s){ }else guess_mv(s); -#ifdef HAVE_XVMC +#ifdef CONFIG_XVMC /* the filters below are not XvMC compatible, skip them */ if(s->avctx->xvmc_acceleration) goto ec_clean; #endif @@ -1023,7 +1023,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); } -#ifdef HAVE_XVMC +#ifdef CONFIG_XVMC ec_clean: #endif /* clean a few tables */ |