# HG changeset patch # User zuxy # Date 1233559565 0 # Node ID 5e5e9962a96d135d6612660f28edb386ff906a12 # Parent e705056e492ecea7987f66ee9f524e043b22d612 Convert CONFIG_XVMC into a 0/1 definition. diff -r e705056e492e -r 5e5e9962a96d libmpcodecs/vd_ffmpeg.c --- a/libmpcodecs/vd_ffmpeg.c Sun Feb 01 23:40:26 2009 +0000 +++ b/libmpcodecs/vd_ffmpeg.c Mon Feb 02 07:26:05 2009 +0000 @@ -26,7 +26,7 @@ #include "libavcodec/avcodec.h" -#ifdef CONFIG_XVMC +#if CONFIG_XVMC #include "xvmc_render.h" #endif @@ -59,7 +59,7 @@ static int get_buffer(AVCodecContext *avctx, AVFrame *pic); static void release_buffer(AVCodecContext *avctx, AVFrame *pic); -#ifdef CONFIG_XVMC +#if CONFIG_XVMC static enum PixelFormat get_format(struct AVCodecContext * avctx, const enum PixelFormat * pix_fmt); static int mc_get_buffer(AVCodecContext *avctx, AVFrame *pic); @@ -143,7 +143,7 @@ if(avctx->pix_fmt==PIX_FMT_YUV420P) return CONTROL_TRUE;// u/v swap if(avctx->pix_fmt==PIX_FMT_YUV422P && !ctx->do_dr1) return CONTROL_TRUE;// half stride break; -#ifdef CONFIG_XVMC +#if CONFIG_XVMC case IMGFMT_XVMC_IDCT_MPEG2: case IMGFMT_XVMC_MOCO_MPEG2: if(avctx->pix_fmt==PIX_FMT_XVMC_MPEG2_IDCT) return CONTROL_TRUE; @@ -250,7 +250,7 @@ ctx->avctx = avcodec_alloc_context(); avctx = ctx->avctx; -#ifdef CONFIG_XVMC +#if CONFIG_XVMC #ifdef CODEC_CAP_HWACCEL if(lavc_codec->capabilities & CODEC_CAP_HWACCEL){ @@ -533,7 +533,7 @@ case PIX_FMT_RGB565: ctx->best_csp=IMGFMT_BGR16;break; //4xm case PIX_FMT_GRAY8: ctx->best_csp=IMGFMT_Y800;break; // gray jpeg case PIX_FMT_PAL8: ctx->best_csp=IMGFMT_BGR8;break; //8bps,mrle,cram -#ifdef CONFIG_XVMC +#if CONFIG_XVMC case PIX_FMT_XVMC_MPEG2_MC:ctx->best_csp=IMGFMT_XVMC_MOCO_MPEG2;break; case PIX_FMT_XVMC_MPEG2_IDCT:ctx->best_csp=IMGFMT_XVMC_IDCT_MPEG2;break; #endif @@ -910,7 +910,7 @@ return mpi; } -#ifdef CONFIG_XVMC +#if CONFIG_XVMC static enum PixelFormat get_format(struct AVCodecContext * avctx, const enum PixelFormat * fmt){ sh_video_t * sh = avctx->opaque;