diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-12-19 00:29:24 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-12-19 00:29:24 +0200 |
commit | 71b25cca7644ab059393e9ee4682d79aab41ceba (patch) | |
tree | ce2017db0a47e61b280ff41c00dccedae77fbd1d /libmpcodecs | |
parent | a3ab9e8e4649601281f78949e56b92755ae1142a (diff) | |
parent | b8830753f103748e8faa630ba636c845263906ce (diff) | |
download | mpv-71b25cca7644ab059393e9ee4682d79aab41ceba.tar.bz2 mpv-71b25cca7644ab059393e9ee4682d79aab41ceba.tar.xz |
Merge svn changes up to r28162
Diffstat (limited to 'libmpcodecs')
-rw-r--r-- | libmpcodecs/vd_ffmpeg.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index d4a43a5724..17db42b5cc 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -27,7 +27,7 @@ LIBVD_EXTERN(ffmpeg) #include "libavcodec/avcodec.h" -#ifdef HAVE_XVMC +#ifdef CONFIG_XVMC #include "xvmc_render.h" #endif @@ -61,7 +61,7 @@ typedef struct { static int get_buffer(AVCodecContext *avctx, AVFrame *pic); static void release_buffer(AVCodecContext *avctx, AVFrame *pic); -#ifdef HAVE_XVMC +#ifdef CONFIG_XVMC static enum PixelFormat get_format(struct AVCodecContext * avctx, const enum PixelFormat * pix_fmt); static int mc_get_buffer(AVCodecContext *avctx, AVFrame *pic); @@ -125,7 +125,7 @@ static int control(sh_video_t *sh,int cmd,void* arg,...){ 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 HAVE_XVMC +#ifdef CONFIG_XVMC case IMGFMT_XVMC_IDCT_MPEG2: case IMGFMT_XVMC_MOCO_MPEG2: if(avctx->pix_fmt==PIX_FMT_XVMC_MPEG2_IDCT) return CONTROL_TRUE; @@ -233,7 +233,7 @@ static int init(sh_video_t *sh){ ctx->avctx = avcodec_alloc_context(); avctx = ctx->avctx; -#ifdef HAVE_XVMC +#ifdef CONFIG_XVMC #ifdef CODEC_CAP_HWACCEL if(lavc_codec->capabilities & CODEC_CAP_HWACCEL){ @@ -250,7 +250,7 @@ static int init(sh_video_t *sh){ avctx->draw_horiz_band = mc_render_slice; avctx->slice_flags=SLICE_FLAG_CODED_ORDER|SLICE_FLAG_ALLOW_FIELD; }else -#endif /* HAVE_XVMC */ +#endif /* CONFIG_XVMC */ if(ctx->do_dr1){ avctx->flags|= CODEC_FLAG_EMU_EDGE; avctx->get_buffer= get_buffer; @@ -517,7 +517,7 @@ static int init_vo(sh_video_t *sh, enum PixelFormat pix_fmt){ 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 HAVE_XVMC +#ifdef 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 @@ -895,7 +895,7 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){ return mpi; } -#ifdef HAVE_XVMC +#ifdef CONFIG_XVMC static enum PixelFormat get_format(struct AVCodecContext * avctx, const enum PixelFormat * fmt){ sh_video_t * sh = avctx->opaque; @@ -1055,4 +1055,4 @@ uint8_t *source[3]= {src->data[0], src->data[1], src->data[2]}; } -#endif // HAVE_XVMC +#endif /* CONFIG_XVMC */ |