From a7ee37fc893349b3bb453fab23146b06ef0a74f4 Mon Sep 17 00:00:00 2001 From: iive Date: Sat, 26 Jul 2003 00:55:36 +0000 Subject: xvmc updates git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10472 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/vd_ffmpeg.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'libmpcodecs') diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index ed5ab5eb51..69c8b169b6 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -47,8 +47,7 @@ LIBVD_EXTERN(ffmpeg) #define PIX_FMT_RGBA32 PIX_FMT_BGRA32 #endif -//!!TODO!! when ffmpeg is patched set correct version number -#if LIBAVCODEC_BUILD < 4671 +#if LIBAVCODEC_BUILD < 4672 #undef HAVE_XVMC #endif @@ -134,7 +133,7 @@ static int control(sh_video_t *sh,int cmd,void* arg,...){ #ifdef HAVE_XVMC case IMGFMT_XVMC_IDCT_MPEG2: case IMGFMT_XVMC_MOCO_MPEG2: - if(avctx->pix_fmt==PIX_FMT_XVMC_MPEG2) return CONTROL_TRUE; + if(avctx->pix_fmt==PIX_FMT_XVMC_MPEG2_IDCT) return CONTROL_TRUE; #endif } return CONTROL_FALSE; @@ -193,7 +192,8 @@ static int init(sh_video_t *sh){ avctx->flags|= CODEC_FLAG_EMU_EDGE;//do i need that??!! avctx->get_buffer= mc_get_buffer; avctx->release_buffer= mc_release_buffer; - avctx->draw_horiz_band = mc_render_slice; + avctx->draw_horiz_band = mc_render_slice; + avctx->slice_flags=SLICE_FLAG_CODED_ORDER|SLICE_FLAG_ALLOW_FIELD; }else #endif if(ctx->do_dr1){ @@ -406,7 +406,8 @@ static int init_vo(sh_video_t *sh){ case PIX_FMT_RGB24 : ctx->best_csp=IMGFMT_BGR24;break; //huffyuv case PIX_FMT_RGBA32: ctx->best_csp=IMGFMT_BGR32;break; //huffyuv / mjpeg #ifdef HAVE_XVMC - case PIX_FMT_XVMC_MPEG2:ctx->best_csp=IMGFMT_XVMC_IDCT_MPEG2;break; + 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 default: ctx->best_csp=0; -- cgit v1.2.3