Mercurial > mplayer.hg
changeset 28119:ab477599c7df
xvmc is now a CONFIG_ option in FFmpeg.
| author | diego |
|---|---|
| date | Mon, 15 Dec 2008 22:25:39 +0000 |
| parents | 4455edd2be89 |
| children | 4439fff4d904 |
| files | configure libmpcodecs/vd_ffmpeg.c libvo/video_out.c |
| diffstat | 3 files changed, 12 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Mon Dec 15 20:19:27 2008 +0000 +++ b/configure Mon Dec 15 22:25:39 2008 +0000 @@ -4114,12 +4114,12 @@ done fi if test "$_xvmc" = yes ; then - _def_xvmc='#define HAVE_XVMC 1' + _def_xvmc='#define CONFIG_XVMC 1' _libs_mplayer="$_libs_mplayer -lXvMC -l$_xvmclib" _vomodules="xvmc $_vomodules" _res_comment="using $_xvmclib" else - _def_xvmc='#undef HAVE_XVMC' + _def_xvmc='#undef CONFIG_XVMC' _novomodules="xvmc $_novomodules" _libavdecoders=`echo $_libavdecoders | sed -e s/MPEG_XVMC_DECODER// ` fi @@ -7975,7 +7975,6 @@ GUI_WIN32 = $_gui_win32 HAVE_POSIX_SELECT = $_posix_select HAVE_SYS_MMAN_H = $_mman -HAVE_XVMC = $_xvmc IVTV = $_ivtv JACK = $_jack JOYSTICK = $_joystick @@ -8130,6 +8129,7 @@ CONFIG_POSTPROC = yes # Prevent building libavcodec/imgresample.c with conflicting symbols CONFIG_SWSCALE=yes +CONFIG_XVMC=$_xvmc CONFIG_ZLIB=$_zlib HAVE_PTHREADS = $_pthreads
--- a/libmpcodecs/vd_ffmpeg.c Mon Dec 15 20:19:27 2008 +0000 +++ b/libmpcodecs/vd_ffmpeg.c Mon Dec 15 22:25:39 2008 +0000 @@ -26,7 +26,7 @@ #include "libavcodec/avcodec.h" -#ifdef HAVE_XVMC +#ifdef 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 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); @@ -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 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; @@ -250,7 +250,7 @@ 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){ @@ -267,7 +267,7 @@ 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; @@ -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 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 @@ -910,7 +910,7 @@ 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; @@ -1070,4 +1070,4 @@ } -#endif // HAVE_XVMC +#endif /* CONFIG_XVMC */