Change semantic of CONFIG_*, HAVE_* and ARCH_*.
They are now always defined to either 0 or 1. Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
@ -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 CONFIG_XVMC
|
||||
#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
|
||||
@ -935,7 +935,7 @@ void ff_er_frame_end(MpegEncContext *s){
|
||||
}else
|
||||
guess_mv(s);
|
||||
|
||||
#ifdef CONFIG_XVMC
|
||||
#if CONFIG_XVMC
|
||||
/* 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);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_XVMC
|
||||
#if CONFIG_XVMC
|
||||
ec_clean:
|
||||
#endif
|
||||
/* clean a few tables */
|
||||
|
Reference in New Issue
Block a user