[FFmpeg-cvslog] libmpcodecs/vf_unsharp: update to latest version from mplayer

[multiple authors]

ffmpeg | branch: master | multiple authors <multiple at multiple.x> | Tue Feb  5 14:17:54 2013 +0100| [3ce3d4cc3c0a088e7dd337aa9d46be17c918197b] | committer: Michael Niedermayer

libmpcodecs/vf_unsharp: update to latest version from mplayer

Please see mplayer svn for authorship and individual commits

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3ce3d4cc3c0a088e7dd337aa9d46be17c918197b
---

 libavfilter/libmpcodecs/vf_unsharp.c |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/libavfilter/libmpcodecs/vf_unsharp.c b/libavfilter/libmpcodecs/vf_unsharp.c
index b947769..89eddec 100644
--- a/libavfilter/libmpcodecs/vf_unsharp.c
+++ b/libavfilter/libmpcodecs/vf_unsharp.c
@@ -165,7 +165,8 @@ static void get_image( struct vf_instance *vf, mp_image_t *mpi ) {
     if( mpi->imgfmt!=vf->priv->outfmt )
         return; // colorspace differ
 
-    vf->dmpi = ff_vf_get_image( vf->next, mpi->imgfmt, mpi->type, mpi->flags, mpi->w, mpi->h );
+    mpi->priv =
+    vf->dmpi = ff_vf_get_image( vf->next, mpi->imgfmt, mpi->type, mpi->flags, mpi->width, mpi->height );
     mpi->planes[0] = vf->dmpi->planes[0];
     mpi->stride[0] = vf->dmpi->stride[0];
     mpi->width = vf->dmpi->width;
@@ -179,12 +180,12 @@ static void get_image( struct vf_instance *vf, mp_image_t *mpi ) {
 }
 
 static int put_image( struct vf_instance *vf, mp_image_t *mpi, double pts) {
-    mp_image_t *dmpi;
+    mp_image_t *dmpi = mpi->priv;
+    mpi->priv = NULL;
 
     if( !(mpi->flags & MP_IMGFLAG_DIRECT) )
         // no DR, so get a new image! hope we'll get DR buffer:
-        vf->dmpi = ff_vf_get_image( vf->next,vf->priv->outfmt, MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE, mpi->w, mpi->h);
-    dmpi= vf->dmpi;
+        dmpi = vf->dmpi = ff_vf_get_image( vf->next,vf->priv->outfmt, MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE, mpi->width, mpi->height);
 
     unsharp( dmpi->planes[0], mpi->planes[0], dmpi->stride[0], mpi->stride[0], mpi->w,   mpi->h,   &vf->priv->lumaParam );
     unsharp( dmpi->planes[1], mpi->planes[1], dmpi->stride[1], mpi->stride[1], mpi->w/2, mpi->h/2, &vf->priv->chromaParam );