diff options
| author | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-03-04 22:48:37 +0000 |
|---|---|---|
| committer | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-03-04 22:48:37 +0000 |
| commit | 28c4a74efac0762034140f386b89de56e0449ea8 (patch) | |
| tree | 73fbb351872ff9d534e45db8a0f3997cbc51757a /libmpcodecs | |
| parent | cfa40cf1dc06520acc9ae5a681a68e8441ba1ed2 (diff) | |
| download | mpv-28c4a74efac0762034140f386b89de56e0449ea8.tar.bz2 mpv-28c4a74efac0762034140f386b89de56e0449ea8.tar.xz | |
10l (pp cant convert formats) fixes segfault
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9529 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/vf_pp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmpcodecs/vf_pp.c b/libmpcodecs/vf_pp.c index d1e1a15859..58b996bc72 100644 --- a/libmpcodecs/vf_pp.c +++ b/libmpcodecs/vf_pp.c @@ -54,7 +54,7 @@ static int config(struct vf_instance_s* vf, if(vf->priv->context) pp_free_context(vf->priv->context); vf->priv->context= pp_get_context(width, height, flags); - return vf_next_config(vf,width,height,d_width,d_height,voflags,vf->priv->outfmt); + return vf_next_config(vf,width,height,d_width,d_height,voflags,outfmt); } static void uninit(struct vf_instance_s* vf){ @@ -114,7 +114,7 @@ static void get_image(struct vf_instance_s* vf, mp_image_t *mpi){ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ if(!(mpi->flags&MP_IMGFLAG_DIRECT)){ // no DR, so get a new image! hope we'll get DR buffer: - vf->priv->dmpi=vf_get_image(vf->next,vf->priv->outfmt, + vf->priv->dmpi=vf_get_image(vf->next,mpi->imgfmt, MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE|MP_IMGFLAG_PREFER_ALIGNED_STRIDE, // MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE, // mpi->w,mpi->h); |