diff error_resilience.c @ 8832:3eaabd9c4371 libavcodec

Remove redundant CONFIG_XVMC option, CONFIG_MPEG_XVMC_DECODER suffices.
author diego
date Sat, 14 Feb 2009 15:37:40 +0000
parents e9d9d946f213
children 886ef38c7b36
line wrap: on
line diff
--- a/error_resilience.c	Sat Feb 14 15:30:40 2009 +0000
+++ b/error_resilience.c	Sat Feb 14 15:37:40 2009 +0000
@@ -563,7 +563,7 @@
 
     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 @@
     }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 @@
         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 */