Update of /cvsroot/mplayer/main/libmpcodecs In directory mplayer:/var/tmp.root/cvs-serv16176 Modified Files: vd_ffmpeg.c vd_libmpeg2.c Log Message: draw_slices with framedrop fixed Index: vd_ffmpeg.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_ffmpeg.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- vd_ffmpeg.c 13 Apr 2002 13:40:26 -0000 1.14 +++ vd_ffmpeg.c 14 Apr 2002 01:21:13 -0000 1.15 @@ -147,7 +147,8 @@ if(len<=0) return NULL; // skipped frame - if(ctx->vo_inited && !ctx->convert){ + avctx->draw_horiz_band=NULL; + if(ctx->vo_inited && !ctx->convert && !(flags&3)){ mpi=mpcodecs_get_image(sh, MP_IMGTYPE_EXPORT, MP_IMGFLAG_PRESERVE | (ctx->do_slices?MP_IMGFLAG_DRAW_CALLBACK:0), sh->disp_w, sh->disp_h); @@ -155,8 +156,7 @@ // vd core likes slices! avctx->draw_horiz_band=draw_slice; avctx->opaque=sh->video_out; - } else - avctx->draw_horiz_band=NULL; + } } ret = avcodec_decode_video(avctx, &lavc_picture, Index: vd_libmpeg2.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_libmpeg2.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- vd_libmpeg2.c 7 Apr 2002 16:34:15 -0000 1.10 +++ vd_libmpeg2.c 14 Apr 2002 01:21:13 -0000 1.11 @@ -154,7 +154,7 @@ mp_image_t* mpi; int flags; if (picture->picture_coding_type == B_TYPE){ - flags=vd_use_slices?MP_IMGFLAG_DRAW_CALLBACK:0; + flags=(!framedrop && vd_use_slices)?MP_IMGFLAG_DRAW_CALLBACK:0; picture->display_frame= picture->current_frame = picture->temp_frame; } else {