sub: create sub_bitmap array even when using libass

One sub_bitmaps struct could contain either a libass ASS_Image list, or
a mplayer native list of sub-bitmaps. This caused code duplication in
vo_vdpau.c and bitmap_packer.c.

Avoid this by creating such a sub_bitmap array even with libass. This
basically copies the list and recreates it in mplayer's native format.
It gets rid of the code duplication, and will make implementing extended
subtitle and OSD rendering in other VOs easier.

Also do some cosmetic changes and other preparations for the following
commits.

1 files changed, 3 insertions, 2 deletions

diff --git a/sub/sd_lavc.c b/sub/sd_lavc.c
index 1da33ffca1..39e4891fb1 100644
--- a/sub/sd_lavc.c
+++ b/sub/sd_lavc.c
@@ -175,6 +175,7 @@ static void decode(struct sh_sub *sh, struct osd_state *osd, void *data,
                 uint32_t *outbmp = talloc_size(priv->inbitmaps,
                                                r->w * r->h * 4);
                 b->bitmap = outbmp;
+                b->stride = r->w * 4;
                 b->w = r->w;
                 b->h = r->h;
                 b->x = r->x;
@@ -233,13 +234,13 @@ static void get_bitmaps(struct sh_sub *sh, struct osd_state *osd,
         SET(bo->dh, bi->h * yscale);
     }
     res->parts = priv->outbitmaps;
-    res->part_count = priv->count;
+    res->num_parts = priv->count;
     if (priv->bitmaps_changed)
         res->bitmap_id = ++res->bitmap_pos_id;
     else if (pos_changed)
         res->bitmap_pos_id++;
     priv->bitmaps_changed = false;
-    res->type = SUBBITMAP_RGBA;
+    res->format = SUBBITMAP_RGBA;
     res->scaled = xscale != 1 || yscale != 1;
 }