[MPlayer-cvslog] r34970 - trunk/libmpcodecs/vf_ass.c

[reimar]

Author: reimar
Date: Fri May 25 22:31:10 2012
New Revision: 34970

Log:
Request a sufficiently large image for direct rendering.

Due to alignment and similar, we might need a buffer
larger than the output of the ASS filter.
Fixes out of bound writes and/or broken video near the
borders.

Modified:
   trunk/libmpcodecs/vf_ass.c

Modified: trunk/libmpcodecs/vf_ass.c
==============================================================================
--- trunk/libmpcodecs/vf_ass.c	Thu May 24 14:56:31 2012	(r34969)
+++ trunk/libmpcodecs/vf_ass.c	Fri May 25 22:31:10 2012	(r34970)
@@ -111,7 +111,8 @@ static void get_image(struct vf_instance
     // width never changes, always try full DR
     mpi->priv = vf->dmpi = vf_get_image(vf->next, mpi->imgfmt, mpi->type,
                                         mpi->flags | MP_IMGFLAG_READABLE,
-                                        vf->priv->outw, vf->priv->outh);
+                                        FFMAX(mpi->width,  vf->priv->outw),
+                                        FFMAX(mpi->height, vf->priv->outh));
 
     if ( (vf->dmpi->flags & MP_IMGFLAG_DRAW_CALLBACK) &&
         !(vf->dmpi->flags & MP_IMGFLAG_DIRECT)) {