diff options
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | libmpcodecs/vd_ffmpeg.c | 16 | ||||
| -rw-r--r-- | libvo/video_out.c | 2 |
3 files changed, 12 insertions, 12 deletions
@@ -4114,12 +4114,12 @@ EOF 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_GTK = $_gui_gtk 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_MUXERS=$_mencoder CONFIG_POSTPROC = yes # Prevent building libavcodec/imgresample.c with conflicting symbols CONFIG_SWSCALE=yes +CONFIG_XVMC=$_xvmc CONFIG_ZLIB=$_zlib HAVE_PTHREADS = $_pthreads diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index 1a25a84959..dc3aee1060 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -26,7 +26,7 @@ LIBVD_EXTERN(ffmpeg) #include "libavcodec/avcodec.h" -#ifdef HAVE_XVMC +#ifdef CONFIG_XVMC #include "xvmc_render.h" #endif @@ -59,7 +59,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); @@ -143,7 +143,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; @@ -250,7 +250,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){ @@ -267,7 +267,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; @@ -533,7 +533,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 @@ -910,7 +910,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; @@ -1070,4 +1070,4 @@ uint8_t *source[3]= {src->data[0], src->data[1], src->data[2]}; } -#endif // HAVE_XVMC +#endif /* CONFIG_XVMC */ diff --git a/libvo/video_out.c b/libvo/video_out.c index d2209a5175..1bf03dc36d 100644 --- a/libvo/video_out.c +++ b/libvo/video_out.c @@ -225,7 +225,7 @@ const vo_functions_t* const video_out_drivers[] = #endif &video_out_null, // should not be auto-selected -#ifdef HAVE_XVMC +#ifdef CONFIG_XVMC &video_out_xvmc, #endif &video_out_mpegpes, |