cosmetics: reformat vf_ass to K&R style

1 files changed, 318 insertions, 289 deletions

diff --git a/libmpcodecs/vf_ass.c b/libmpcodecs/vf_ass.c
index 0af76a7ee0..9eb4888fa5 100644
--- a/libmpcodecs/vf_ass.c
+++ b/libmpcodecs/vf_ass.c
@@ -47,27 +47,27 @@
 #define _g(c)  (((c)>>16)&0xFF)
 #define _b(c)  (((c)>>8)&0xFF)
 #define _a(c)  ((c)&0xFF)
-#define rgba2y(c)  ( (( 263*_r(c)  + 516*_g(c) + 100*_b(c)) >> 10) + 16  )
+#define rgba2y(c)  ( (( 263*_r(c) + 516*_g(c) + 100*_b(c)) >> 10) + 16  )
 #define rgba2u(c)  ( ((-152*_r(c) - 298*_g(c) + 450*_b(c)) >> 10) + 128 )
 #define rgba2v(c)  ( (( 450*_r(c) - 376*_g(c) -  73*_b(c)) >> 10) + 128 )
 
 
 static const struct vf_priv_s {
-	int outh, outw;
+    int outh, outw;
 
-	unsigned int outfmt;
+    unsigned int outfmt;
 
-	// 1 = auto-added filter: insert only if chain does not support EOSD already
-	// 0 = insert always
-	int auto_insert;
+    // 1 = auto-added filter: insert only if chain does not support EOSD already
+    // 0 = insert always
+    int auto_insert;
 
-	ASS_Renderer* ass_priv;
+    ASS_Renderer *ass_priv;
 
-	unsigned char* planes[3];
-	struct line_limits {
-		uint16_t start;
-		uint16_t end;
-	} *line_limits;
+    unsigned char *planes[3];
+    struct line_limits {
+        uint16_t start;
+        uint16_t end;
+    } *line_limits;
 } vf_priv_dflt;
 
 extern ASS_Track *ass_track;
@@ -75,150 +75,170 @@ extern float sub_delay;
 extern int sub_visibility;
 
 static int config(struct vf_instance *vf,
-	int width, int height, int d_width, int d_height,
-	unsigned int flags, unsigned int outfmt)
+                  int width, int height, int d_width, int d_height,
+                  unsigned int flags, unsigned int outfmt)
 {
-	struct MPOpts *opts = vf->opts;
-	if (outfmt == IMGFMT_IF09) return 0;
+    struct MPOpts *opts = vf->opts;
+    if (outfmt == IMGFMT_IF09)
+        return 0;
 
-	vf->priv->outh = height + ass_top_margin + ass_bottom_margin;
-	vf->priv->outw = width;
+    vf->priv->outh = height + ass_top_margin + ass_bottom_margin;
+    vf->priv->outw = width;
 
-	if (!opts->screen_size_x && !opts->screen_size_y) {
-		d_width = d_width * vf->priv->outw / width;
-		d_height = d_height * vf->priv->outh / height;
-	}
+    if (!opts->screen_size_x && !opts->screen_size_y) {
+        d_width = d_width * vf->priv->outw / width;
+        d_height = d_height * vf->priv->outh / height;
+    }
 
-	vf->priv->planes[1] = malloc(vf->priv->outw * vf->priv->outh);
-	vf->priv->planes[2] = malloc(vf->priv->outw * vf->priv->outh);
-	vf->priv->line_limits = malloc((vf->priv->outh + 1) / 2 * sizeof(*vf->priv->line_limits));
+    vf->priv->planes[1]   = malloc(vf->priv->outw * vf->priv->outh);
+    vf->priv->planes[2]   = malloc(vf->priv->outw * vf->priv->outh);
+    vf->priv->line_limits = malloc((vf->priv->outh + 1) / 2 * sizeof(*vf->priv->line_limits));
 
-	if (vf->priv->ass_priv) {
-		ass_configure(vf->priv->ass_priv, vf->priv->outw, vf->priv->outh, 0);
-		ass_set_aspect_ratio(vf->priv->ass_priv, 1, 1);
-	}
+    if (vf->priv->ass_priv) {
+        ass_configure(vf->priv->ass_priv, vf->priv->outw, vf->priv->outh, 0);
+        ass_set_aspect_ratio(vf->priv->ass_priv, 1, 1);
+    }
 
-	return vf_next_config(vf, vf->priv->outw, vf->priv->outh, d_width, d_height, flags, outfmt);
+    return vf_next_config(vf, vf->priv->outw, vf->priv->outh, d_width,
+			  d_height, flags, outfmt);
 }
 
 static void get_image(struct vf_instance *vf, mp_image_t *mpi)
 {
-	if(mpi->type == MP_IMGTYPE_IPB) return;
-	if(mpi->flags & MP_IMGFLAG_PRESERVE) return;
-	if(mpi->imgfmt != vf->priv->outfmt) return; // colorspace differ
-
-	// 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);
-
-	if((vf->dmpi->flags & MP_IMGFLAG_DRAW_CALLBACK) &&
-			!(vf->dmpi->flags & MP_IMGFLAG_DIRECT)){
-		mp_tmsg(MSGT_ASS, MSGL_INFO, "Full DR not possible, trying SLICES instead!\n");
-		return;
-	}
-
-	// set up mpi as a cropped-down image of dmpi:
-	if(mpi->flags&MP_IMGFLAG_PLANAR){
-		mpi->planes[0]=vf->dmpi->planes[0] + ass_top_margin * vf->dmpi->stride[0];
-		mpi->planes[1]=vf->dmpi->planes[1] + (ass_top_margin >> mpi->chroma_y_shift) * vf->dmpi->stride[1];
-		mpi->planes[2]=vf->dmpi->planes[2] + (ass_top_margin >> mpi->chroma_y_shift) * vf->dmpi->stride[2];
-		mpi->stride[1]=vf->dmpi->stride[1];
-		mpi->stride[2]=vf->dmpi->stride[2];
-	} else {
-		mpi->planes[0]=vf->dmpi->planes[0] + ass_top_margin * vf->dmpi->stride[0];
-	}
-	mpi->stride[0]=vf->dmpi->stride[0];
-	mpi->width=vf->dmpi->width;
-	mpi->flags|=MP_IMGFLAG_DIRECT;
-	mpi->flags&=~MP_IMGFLAG_DRAW_CALLBACK;
+    if (mpi->type == MP_IMGTYPE_IPB)
+        return;
+    if (mpi->flags & MP_IMGFLAG_PRESERVE)
+        return;
+    if (mpi->imgfmt != vf->priv->outfmt)
+        return;                                     // colorspace differ
+
+    // 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);
+
+    if ((vf->dmpi->flags & MP_IMGFLAG_DRAW_CALLBACK) &&
+        !(vf->dmpi->flags & MP_IMGFLAG_DIRECT)) {
+        mp_tmsg(MSGT_ASS, MSGL_INFO, "Full DR not possible, trying SLICES instead!\n");
+        return;
+    }
+
+    // set up mpi as a cropped-down image of dmpi:
+    if (mpi->flags & MP_IMGFLAG_PLANAR) {
+        mpi->planes[0] = vf->dmpi->planes[0] +  ass_top_margin * vf->dmpi->stride[0];
+        mpi->planes[1] = vf->dmpi->planes[1] + (ass_top_margin >> mpi->chroma_y_shift) * vf->dmpi->stride[1];
+        mpi->planes[2] = vf->dmpi->planes[2] + (ass_top_margin >> mpi->chroma_y_shift) * vf->dmpi->stride[2];
+        mpi->stride[1] = vf->dmpi->stride[1];
+        mpi->stride[2] = vf->dmpi->stride[2];
+    } else {
+        mpi->planes[0] = vf->dmpi->planes[0] + ass_top_margin * vf->dmpi->stride[0];
+    }
+    mpi->stride[0] = vf->dmpi->stride[0];
+    mpi->width = vf->dmpi->width;
+    mpi->flags |= MP_IMGFLAG_DIRECT;
+    mpi->flags &= ~MP_IMGFLAG_DRAW_CALLBACK;
 //	vf->dmpi->flags&=~MP_IMGFLAG_DRAW_CALLBACK;
 }
 
 static void blank(mp_image_t *mpi, int y1, int y2)
 {
-	int color[3] = {16, 128, 128}; // black (YUV)
-	int y;
-	unsigned char* dst;
-	int chroma_rows = (y2 - y1) >> mpi->chroma_y_shift;
-
-	dst = mpi->planes[0] + y1 * mpi->stride[0];
-	for (y = 0; y < y2 - y1; ++y) {
-		memset(dst, color[0], mpi->w);
-		dst += mpi->stride[0];
-	}
-	dst = mpi->planes[1] + (y1 >> mpi->chroma_y_shift) * mpi->stride[1];
-	for (y = 0; y < chroma_rows ; ++y) {
-		memset(dst, color[1], mpi->chroma_width);
-		dst += mpi->stride[1];
-	}
-	dst = mpi->planes[2] + (y1 >> mpi->chroma_y_shift) * mpi->stride[2];
-	for (y = 0; y < chroma_rows ; ++y) {
-		memset(dst, color[2], mpi->chroma_width);
-		dst += mpi->stride[2];
-	}
+    int color[3] = {16, 128, 128};    // black (YUV)
+    int y;
+    unsigned char *dst;
+    int chroma_rows = (y2 - y1) >> mpi->chroma_y_shift;
+
+    dst = mpi->planes[0] + y1 * mpi->stride[0];
+    for (y = 0; y < y2 - y1; ++y) {
+        memset(dst, color[0], mpi->w);
+        dst += mpi->stride[0];
+    }
+    dst = mpi->planes[1] + (y1 >> mpi->chroma_y_shift) * mpi->stride[1];
+    for (y = 0; y < chroma_rows; ++y) {
+        memset(dst, color[1], mpi->chroma_width);
+        dst += mpi->stride[1];
+    }
+    dst = mpi->planes[2] + (y1 >> mpi->chroma_y_shift) * mpi->stride[2];
+    for (y = 0; y < chroma_rows; ++y) {
+        memset(dst, color[2], mpi->chroma_width);
+        dst += mpi->stride[2];
+    }
 }
 
 static int prepare_image(struct vf_instance *vf, mp_image_t *mpi)
 {
-	if(mpi->flags&MP_IMGFLAG_DIRECT || mpi->flags&MP_IMGFLAG_DRAW_CALLBACK){
-		vf->dmpi = mpi->priv;
-		if (!vf->dmpi) { mp_tmsg(MSGT_ASS, MSGL_WARN, "Why do we get NULL??\n"); return 0; }
-		mpi->priv = NULL;
-		// we've used DR, so we're ready...
-		if (ass_top_margin)
-			blank(vf->dmpi, 0, ass_top_margin);
-		if (ass_bottom_margin)
-			blank(vf->dmpi, vf->priv->outh - ass_bottom_margin, vf->priv->outh);
-		if(!(mpi->flags&MP_IMGFLAG_PLANAR))
-			vf->dmpi->planes[1] = mpi->planes[1]; // passthrough rgb8 palette
-		return 0;
-	}
-
-	// hope we'll get DR buffer:
-	vf->dmpi = vf_get_image(vf->next, vf->priv->outfmt,
-			MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE | MP_IMGFLAG_READABLE,
-			vf->priv->outw, vf->priv->outh);
-
-	// copy mpi->dmpi...
-	if(mpi->flags&MP_IMGFLAG_PLANAR){
-		memcpy_pic(vf->dmpi->planes[0] + ass_top_margin * vf->dmpi->stride[0],
-				mpi->planes[0], mpi->w, mpi->h,
-				vf->dmpi->stride[0], mpi->stride[0]);
-		memcpy_pic(vf->dmpi->planes[1] + (ass_top_margin >> mpi->chroma_y_shift) * vf->dmpi->stride[1],
-				mpi->planes[1], mpi->w >> mpi->chroma_x_shift, mpi->h >> mpi->chroma_y_shift,
-				vf->dmpi->stride[1], mpi->stride[1]);
-		memcpy_pic(vf->dmpi->planes[2] + (ass_top_margin >> mpi->chroma_y_shift) * vf->dmpi->stride[2],
-				mpi->planes[2], mpi->w >> mpi->chroma_x_shift, mpi->h >> mpi->chroma_y_shift,
-				vf->dmpi->stride[2], mpi->stride[2]);
-	} else {
-		memcpy_pic(vf->dmpi->planes[0] + ass_top_margin * vf->dmpi->stride[0],
-				mpi->planes[0], mpi->w*(vf->dmpi->bpp/8), mpi->h,
-				vf->dmpi->stride[0], mpi->stride[0]);
-		vf->dmpi->planes[1] = mpi->planes[1]; // passthrough rgb8 palette
-	}
-	if (ass_top_margin)
-		blank(vf->dmpi, 0, ass_top_margin);
-	if (ass_bottom_margin)
-		blank(vf->dmpi, vf->priv->outh - ass_bottom_margin, vf->priv->outh);
-	return 0;
+    if (mpi->flags & MP_IMGFLAG_DIRECT
+	|| mpi->flags & MP_IMGFLAG_DRAW_CALLBACK) {
+        vf->dmpi = mpi->priv;
+        if (!vf->dmpi) {
+            mp_tmsg(MSGT_ASS, MSGL_WARN, "Why do we get NULL??\n");
+	    return 0;
+        }
+        mpi->priv = NULL;
+        // we've used DR, so we're ready...
+        if (ass_top_margin)
+            blank(vf->dmpi, 0, ass_top_margin);
+        if (ass_bottom_margin)
+            blank(vf->dmpi, vf->priv->outh - ass_bottom_margin, vf->priv->outh);
+        if (!(mpi->flags & MP_IMGFLAG_PLANAR))
+            vf->dmpi->planes[1] = mpi->planes[1];             // passthrough rgb8 palette
+        return 0;
+    }
+
+    // hope we'll get DR buffer:
+    vf->dmpi = vf_get_image(vf->next, vf->priv->outfmt, MP_IMGTYPE_TEMP,
+			    MP_IMGFLAG_ACCEPT_STRIDE | MP_IMGFLAG_READABLE,
+                            vf->priv->outw, vf->priv->outh);
+
+    // copy mpi->dmpi...
+    if (mpi->flags & MP_IMGFLAG_PLANAR) {
+        memcpy_pic(vf->dmpi->planes[0] + ass_top_margin * vf->dmpi->stride[0],
+                   mpi->planes[0],
+		   mpi->w,
+		   mpi->h,
+                   vf->dmpi->stride[0],
+		   mpi->stride[0]);
+        memcpy_pic(vf->dmpi->planes[1] + (ass_top_margin >> mpi->chroma_y_shift) * vf->dmpi->stride[1],
+                   mpi->planes[1],
+		   mpi->w >> mpi->chroma_x_shift,
+		   mpi->h >> mpi->chroma_y_shift,
+                   vf->dmpi->stride[1],
+		   mpi->stride[1]);
+        memcpy_pic(vf->dmpi->planes[2] + (ass_top_margin >> mpi->chroma_y_shift) * vf->dmpi->stride[2],
+                   mpi->planes[2],
+		   mpi->w >> mpi->chroma_x_shift,
+		   mpi->h >> mpi->chroma_y_shift,
+                   vf->dmpi->stride[2],
+		   mpi->stride[2]);
+    } else {
+        memcpy_pic(vf->dmpi->planes[0] + ass_top_margin * vf->dmpi->stride[0],
+                   mpi->planes[0],
+		   mpi->w * (vf->dmpi->bpp / 8),
+		   mpi->h,
+                   vf->dmpi->stride[0],
+		   mpi->stride[0]);
+        vf->dmpi->planes[1] = mpi->planes[1];   // passthrough rgb8 palette
+    }
+    if (ass_top_margin)
+        blank(vf->dmpi, 0, ass_top_margin);
+    if (ass_bottom_margin)
+        blank(vf->dmpi, vf->priv->outh - ass_bottom_margin, vf->priv->outh);
+    return 0;
 }
 
 static void update_limits(struct vf_instance *vf, int starty, int endy,
-			  int startx, int endx)
+                          int startx, int endx)
 {
-	starty >>= 1;
-	endy = (endy + 1) >> 1;
-	startx >>= 1;
-	endx = (endx + 1) >> 1;
-	for (int i = starty; i < endy; i++) {
-		struct line_limits *ll = vf->priv->line_limits + i;
-		if (startx < ll->start)
-			ll->start = startx;
-		if (endx > ll->end)
-			ll->end = endx;
-	}
+    starty >>= 1;
+    endy = (endy + 1) >> 1;
+    startx >>= 1;
+    endx = (endx + 1) >> 1;
+    for (int i = starty; i < endy; i++) {
+        struct line_limits *ll = vf->priv->line_limits + i;
+        if (startx < ll->start)
+            ll->start = startx;
+        if (endx > ll->end)
+            ll->end = endx;
+    }
 }
 
 /**
@@ -226,28 +246,28 @@ static void update_limits(struct vf_instance *vf, int starty, int endy,
  */
 static void copy_from_image(struct vf_instance *vf)
 {
-	int pl;
-
-	for (pl = 1; pl < 3; ++pl) {
-		int dst_stride = vf->priv->outw;
-		int src_stride = vf->dmpi->stride[pl];
-
-		unsigned char* src = vf->dmpi->planes[pl];
-		unsigned char* dst = vf->priv->planes[pl];
-		for (int i = 0; i < (vf->priv->outh + 1) / 2; i++) {
-			struct line_limits *ll = vf->priv->line_limits + i;
-			unsigned char* dst_next = dst + dst_stride;
-			for (int j = ll->start; j < ll->end; j++) {
-				unsigned char val = src[j];
-				dst[j << 1] = val;
-				dst[(j << 1) + 1] = val;
-				dst_next[j << 1] = val;
-				dst_next[(j << 1) + 1] = val;
-			}
-			src += src_stride;
-			dst = dst_next + dst_stride;
-		}
-	}
+    int pl;
+
+    for (pl = 1; pl < 3; ++pl) {
+        int dst_stride = vf->priv->outw;
+        int src_stride = vf->dmpi->stride[pl];
+
+        unsigned char *src = vf->dmpi->planes[pl];
+        unsigned char *dst = vf->priv->planes[pl];
+        for (int i = 0; i < (vf->priv->outh + 1) / 2; i++) {
+            struct line_limits *ll = vf->priv->line_limits + i;
+            unsigned char *dst_next = dst + dst_stride;
+            for (int j = ll->start; j < ll->end; j++) {
+                unsigned char val = src[j];
+                dst[j << 1] = val;
+                dst[(j << 1) + 1] = val;
+                dst_next[j << 1] = val;
+                dst_next[(j << 1) + 1] = val;
+            }
+            src += src_stride;
+            dst = dst_next + dst_stride;
+        }
+    }
 }
 
 /**
@@ -255,177 +275,186 @@ static void copy_from_image(struct vf_instance *vf)
  */
 static void copy_to_image(struct vf_instance *vf)
 {
-	int pl;
-	int i, j;
-	for (pl = 1; pl < 3; ++pl) {
-		int dst_stride = vf->dmpi->stride[pl];
-		int src_stride = vf->priv->outw;
-
-		unsigned char* dst = vf->dmpi->planes[pl];
-		unsigned char* src = vf->priv->planes[pl];
-		unsigned char* src_next = vf->priv->planes[pl] + src_stride;
-		for (i = 0; i < vf->dmpi->chroma_height; ++i) {
-			for (j = vf->priv->line_limits[i].start; j < vf->priv->line_limits[i].end; j++) {
-				unsigned val = 0;
-				val += src[j << 1];
-				val += src[(j << 1) + 1];
-				val += src_next[j << 1];
-				val += src_next[(j << 1) + 1];
-				dst[j] = val >> 2;
-			}
-			dst += dst_stride;
-			src = src_next + src_stride;
-			src_next = src + src_stride;
-		}
-	}
+    int pl;
+    int i, j;
+    for (pl = 1; pl < 3; ++pl) {
+        int dst_stride = vf->dmpi->stride[pl];
+        int src_stride = vf->priv->outw;
+
+        unsigned char *dst      = vf->dmpi->planes[pl];
+        unsigned char *src      = vf->priv->planes[pl];
+        unsigned char *src_next = vf->priv->planes[pl] + src_stride;
+        for (i = 0; i < vf->dmpi->chroma_height; ++i) {
+            for (j = vf->priv->line_limits[i].start; j < vf->priv->line_limits[i].end; j++) {
+                unsigned val = 0;
+                val += src[j << 1];
+                val += src[(j << 1) + 1];
+                val += src_next[j << 1];
+                val += src_next[(j << 1) + 1];
+                dst[j] = val >> 2;
+            }
+            dst += dst_stride;
+            src      = src_next + src_stride;
+            src_next = src + src_stride;
+        }
+    }
 }
 
-static void my_draw_bitmap(struct vf_instance *vf, unsigned char* bitmap, int bitmap_w, int bitmap_h, int stride, int dst_x, int dst_y, unsigned color)
+static void my_draw_bitmap(struct vf_instance *vf, unsigned char *bitmap,
+			   int bitmap_w, int bitmap_h, int stride,
+			   int dst_x, int dst_y, unsigned color)
 {
-	unsigned char y = rgba2y(color);
-	unsigned char u = rgba2u(color);
-	unsigned char v = rgba2v(color);
-	unsigned char opacity = 255 - _a(color);
-	unsigned char *src, *dsty, *dstu, *dstv;
-	int i, j;
-	mp_image_t* dmpi = vf->dmpi;
-
-	src = bitmap;
-	dsty = dmpi->planes[0] + dst_x + dst_y * dmpi->stride[0];
-	dstu = vf->priv->planes[1] + dst_x + dst_y * vf->priv->outw;
-	dstv = vf->priv->planes[2] + dst_x + dst_y * vf->priv->outw;
-	for (i = 0; i < bitmap_h; ++i) {
-		for (j = 0; j < bitmap_w; ++j) {
-			unsigned k = (src[j] * opacity + 255) >> 8;
-			dsty[j] = (k*y + (255-k)*dsty[j] + 255) >> 8;
-			dstu[j] = (k*u + (255-k)*dstu[j] + 255) >> 8;
-			dstv[j] = (k*v + (255-k)*dstv[j] + 255) >> 8;
-		}
-		src += stride;
-		dsty += dmpi->stride[0];
-		dstu += vf->priv->outw;
-		dstv += vf->priv->outw;
-	}
+    unsigned char y = rgba2y(color);
+    unsigned char u = rgba2u(color);
+    unsigned char v = rgba2v(color);
+    unsigned char opacity = 255 - _a(color);
+    unsigned char *src, *dsty, *dstu, *dstv;
+    int i, j;
+    mp_image_t *dmpi = vf->dmpi;
+
+    src = bitmap;
+    dsty = dmpi->planes[0] + dst_x + dst_y * dmpi->stride[0];
+    dstu = vf->priv->planes[1] + dst_x + dst_y * vf->priv->outw;
+    dstv = vf->priv->planes[2] + dst_x + dst_y * vf->priv->outw;
+    for (i = 0; i < bitmap_h; ++i) {
+        for (j = 0; j < bitmap_w; ++j) {
+            unsigned k = (src[j] * opacity + 255) >> 8;
+            dsty[j] = (k * y + (255 - k) * dsty[j] + 255) >> 8;
+            dstu[j] = (k * u + (255 - k) * dstu[j] + 255) >> 8;
+            dstv[j] = (k * v + (255 - k) * dstv[j] + 255) >> 8;
+        }
+        src  += stride;
+        dsty += dmpi->stride[0];
+        dstu += vf->priv->outw;
+        dstv += vf->priv->outw;
+    }
 }
 
-static int render_frame(struct vf_instance *vf, mp_image_t *mpi, const ASS_Image *img)
+static int render_frame(struct vf_instance *vf, mp_image_t *mpi,
+			const ASS_Image *img)
 {
-	if (img) {
-		for (int i = 0; i < (vf->priv->outh + 1) / 2; i++)
-			vf->priv->line_limits[i] = (struct line_limits){65535, 0};
-		for (const ASS_Image *im = img; im; im = im->next)
-			update_limits(vf, im->dst_y, im->dst_y + im->h, im->dst_x, im->dst_x + im->w);
-		copy_from_image(vf);
-		while (img) {
-			my_draw_bitmap(vf, img->bitmap, img->w, img->h, img->stride,
-					img->dst_x, img->dst_y, img->color);
-			img = img->next;
-		}
-		copy_to_image(vf);
-	}
-	return 0;
+    if (img) {
+        for (int i = 0; i < (vf->priv->outh + 1) / 2; i++)
+            vf->priv->line_limits[i] = (struct line_limits){65535, 0};
+        for (const ASS_Image *im = img; im; im = im->next)
+            update_limits(vf, im->dst_y, im->dst_y + im->h,
+			  im->dst_x, im->dst_x + im->w);
+        copy_from_image(vf);
+        while (img) {
+            my_draw_bitmap(vf, img->bitmap, img->w, img->h, img->stride,
+                           img->dst_x, img->dst_y, img->color);
+            img = img->next;
+        }
+        copy_to_image(vf);
+    }
+    return 0;
 }
 
 static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts)
 {
-	ASS_Image* images = 0;
-	if (sub_visibility && vf->priv->ass_priv && ass_track && (pts != MP_NOPTS_VALUE))
-		images = ass_mp_render_frame(vf->priv->ass_priv, ass_track, (pts+sub_delay) * 1000 + .5, NULL);
+    ASS_Image *images = 0;
+    if (sub_visibility && vf->priv->ass_priv && ass_track
+	&& (pts != MP_NOPTS_VALUE))
+        images = ass_mp_render_frame(vf->priv->ass_priv, ass_track,
+				     (pts + sub_delay) * 1000 + .5, NULL);
 
-	prepare_image(vf, mpi);
-	if (images) render_frame(vf, mpi, images);
+    prepare_image(vf, mpi);
+    if (images)
+        render_frame(vf, mpi, images);
 
-	return vf_next_put_image(vf, vf->dmpi, pts);
+    return vf_next_put_image(vf, vf->dmpi, pts);
 }
 
 static int query_format(struct vf_instance *vf, unsigned int fmt)
 {
-	switch(fmt){
-	case IMGFMT_YV12:
-	case IMGFMT_I420:
-	case IMGFMT_IYUV:
-		return vf_next_query_format(vf, vf->priv->outfmt);
-	}
-	return 0;
+    switch (fmt) {
+    case IMGFMT_YV12:
+    case IMGFMT_I420:
+    case IMGFMT_IYUV:
+        return vf_next_query_format(vf, vf->priv->outfmt);
+    }
+    return 0;
 }
 
 static int control(vf_instance_t *vf, int request, void *data)
 {
-	switch (request) {
-	case VFCTRL_INIT_EOSD:
-		vf->priv->ass_priv = ass_renderer_init((ASS_Library*)data);
-		if (!vf->priv->ass_priv) return CONTROL_FALSE;
-		ass_configure_fonts(vf->priv->ass_priv);
-		return CONTROL_TRUE;
-	case VFCTRL_DRAW_EOSD:
-		if (vf->priv->ass_priv) return CONTROL_TRUE;
-		break;
-	}
-	return vf_next_control(vf, request, data);
+    switch (request) {
+    case VFCTRL_INIT_EOSD:
+        vf->priv->ass_priv = ass_renderer_init((ASS_Library *)data);
+        if (!vf->priv->ass_priv)
+            return CONTROL_FALSE;
+        ass_configure_fonts(vf->priv->ass_priv);
+        return CONTROL_TRUE;
+    case VFCTRL_DRAW_EOSD:
+        if (vf->priv->ass_priv)
+            return CONTROL_TRUE;
+        break;
+    }
+    return vf_next_control(vf, request, data);
 }
 
 static void uninit(struct vf_instance *vf)
 {
-	if (vf->priv->ass_priv)
-		ass_renderer_done(vf->priv->ass_priv);
-	free(vf->priv->planes[1]);
-	free(vf->priv->planes[2]);
-	free(vf->priv->line_limits);
-	free(vf->priv);
+    if (vf->priv->ass_priv)
+        ass_renderer_done(vf->priv->ass_priv);
+    free(vf->priv->planes[1]);
+    free(vf->priv->planes[2]);
+    free(vf->priv->line_limits);
+    free(vf->priv);
 }
 
-static const unsigned int fmt_list[]={
-	IMGFMT_YV12,
-	IMGFMT_I420,
-	IMGFMT_IYUV,
-	0
+static const unsigned int fmt_list[] = {
+    IMGFMT_YV12,
+    IMGFMT_I420,
+    IMGFMT_IYUV,
+    0
 };
 
 static int vf_open(vf_instance_t *vf, char *args)
 {
-	int flags;
-	vf->priv->outfmt = vf_match_csp(&vf->next,fmt_list,IMGFMT_YV12);
-	if (vf->priv->outfmt)
-		flags = vf_next_query_format(vf, vf->priv->outfmt);
-	if (!vf->priv->outfmt) {
-		uninit(vf);
-		return 0;
-	} else if (vf->priv->auto_insert && flags&VFCAP_EOSD) {
-		uninit(vf);
-		return -1;
-	}
-
-	if (vf->priv->auto_insert)
-		mp_msg(MSGT_ASS, MSGL_INFO, "[ass] auto-open\n");
-
-	vf->config = config;
-	vf->query_format = query_format;
-	vf->uninit = uninit;
-	vf->control = control;
-	vf->get_image = get_image;
-	vf->put_image = put_image;
-	vf->default_caps=VFCAP_EOSD;
-	return 1;
+    int flags;
+    vf->priv->outfmt = vf_match_csp(&vf->next, fmt_list, IMGFMT_YV12);
+    if (vf->priv->outfmt)
+        flags = vf_next_query_format(vf, vf->priv->outfmt);
+    if (!vf->priv->outfmt) {
+        uninit(vf);
+        return 0;
+    } else if (vf->priv->auto_insert && flags & VFCAP_EOSD) {
+        uninit(vf);
+        return -1;
+    }
+
+    if (vf->priv->auto_insert)
+        mp_msg(MSGT_ASS, MSGL_INFO, "[ass] auto-open\n");
+
+    vf->config = config;
+    vf->query_format = query_format;
+    vf->uninit    = uninit;
+    vf->control   = control;
+    vf->get_image = get_image;
+    vf->put_image = put_image;
+    vf->default_caps = VFCAP_EOSD;
+    return 1;
 }
 
-#define ST_OFF(f) M_ST_OFF(struct vf_priv_s,f)
+#define ST_OFF(f) M_ST_OFF(struct vf_priv_s, f)
 static const m_option_t vf_opts_fields[] = {
-	{"auto", ST_OFF(auto_insert), CONF_TYPE_FLAG, 0 , 0, 1, NULL},
-	{ NULL, NULL, 0, 0, 0, 0,  NULL }
+    {"auto", ST_OFF(auto_insert), CONF_TYPE_FLAG, 0, 0, 1, NULL},
+    {NULL, NULL, 0, 0, 0, 0, NULL}
 };
 
 static const m_struct_t vf_opts = {
-	"ass",
-	sizeof(struct vf_priv_s),
-	&vf_priv_dflt,
-	vf_opts_fields
+    "ass",
+    sizeof(struct vf_priv_s),
+    &vf_priv_dflt,
+    vf_opts_fields
 };
 
 const vf_info_t vf_info_ass = {
-	"Render ASS/SSA subtitles",
-	"ass",
-	"Evgeniy Stepanov",
-	"",
-	vf_open,
-	&vf_opts
+    "Render ASS/SSA subtitles",
+    "ass",
+    "Evgeniy Stepanov",
+    "",
+    vf_open,
+    &vf_opts
 };