summaryrefslogtreecommitdiffstats
path: root/libmpcodecs
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-07-20 16:38:31 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-07-20 16:38:31 +0000
commit2d9662d5ef1517376459746e9b8a91e92c2c6641 (patch)
treebbdf73380c028d7092fee07f3e6489498e4a62db /libmpcodecs
parent6db1c8f076e189bd750ade5c732bd09d710cef4b (diff)
downloadmpv-2d9662d5ef1517376459746e9b8a91e92c2c6641.tar.bz2
mpv-2d9662d5ef1517376459746e9b8a91e92c2c6641.tar.xz
DR1+IPB support (works only with ffmpeg12, as libmpeg2 doesn't accept stride)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6762 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
-rw-r--r--libmpcodecs/vf_expand.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libmpcodecs/vf_expand.c b/libmpcodecs/vf_expand.c
index 64e71c723a..dc9e08ad33 100644
--- a/libmpcodecs/vf_expand.c
+++ b/libmpcodecs/vf_expand.c
@@ -181,7 +181,7 @@ static int config(struct vf_instance_s* vf,
// 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 @@ static void get_image(struct vf_instance_s* vf, mp_image_t *mpi){
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