Mercurial > mplayer.hg
changeset 6761:cb1180ccac76
DR1+IPB support (works only with ffmpeg12, as libmpeg2 doesn't accept stride)
author | arpi |
---|---|
date | Sat, 20 Jul 2002 16:38:31 +0000 |
parents | d4db17f7271a |
children | 8411ea0d9078 |
files | libmpcodecs/vf_expand.c |
diffstat | 1 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpcodecs/vf_expand.c Sat Jul 20 16:27:17 2002 +0000 +++ b/libmpcodecs/vf_expand.c Sat Jul 20 16:38:31 2002 +0000 @@ -181,7 +181,7 @@ // codec -copy-> expand -copy-> vo (worst case) static void get_image(struct vf_instance_s* vf, mp_image_t *mpi){ - if(mpi->type==MP_IMGTYPE_IPB) return; // not yet working +// if(mpi->type==MP_IMGTYPE_IPB) return; // not yet working #ifdef OSD_SUPPORT if(vf->priv->osd && (mpi->flags&MP_IMGFLAG_PRESERVE)){ // check if we have to render osd! @@ -213,11 +213,13 @@ mpi->stride[0]=vf->priv->dmpi->stride[0]; mpi->width=vf->priv->dmpi->width; mpi->flags|=MP_IMGFLAG_DIRECT; + mpi->priv=(void*)vf->priv->dmpi; } } static void put_image(struct vf_instance_s* vf, mp_image_t *mpi){ if(mpi->flags&MP_IMGFLAG_DIRECT){ + vf->priv->dmpi=mpi->priv; #ifdef OSD_SUPPORT if(vf->priv->osd) draw_osd(vf,mpi->w,mpi->h); #endif