[MPlayer-cvslog] r37733 - trunk/libmpcodecs/vf_screenshot.c

[rtogni]

Author: rtogni
Date: Sun Feb 14 21:36:28 2016
New Revision: 37733

Log:
Fix screenshot scaling when slices are not used.

swscale requires the height of the source slice, not of the destination.
This fixes a crash with -vf screenshot -noslices for sample
mpeg_crash_ss_beetlejuice.mpg.

Reported on -user by Josh

Modified:
   trunk/libmpcodecs/vf_screenshot.c

Modified: trunk/libmpcodecs/vf_screenshot.c
==============================================================================
--- trunk/libmpcodecs/vf_screenshot.c	Sun Feb 14 16:33:24 2016	(r37732)
+++ trunk/libmpcodecs/vf_screenshot.c	Sun Feb 14 21:36:28 2016	(r37733)
@@ -153,7 +153,7 @@ static void scale_image(struct vf_priv_s
     if (!priv->pic->data[0])
         priv->pic->data[0] = av_malloc(priv->pic->linesize[0]*priv->dh);
 
-    sws_scale(priv->ctx, mpi->planes, mpi->stride, 0, priv->dh, priv->pic->data, priv->pic->linesize);
+    sws_scale(priv->ctx, mpi->planes, mpi->stride, 0, mpi->height, priv->pic->data, priv->pic->linesize);
 }
 
 static void start_slice(struct vf_instance *vf, mp_image_t *mpi)