Mercurial > libavcodec.hg
diff dvdsubenc.c @ 8512:aa45029f5cd7 libavcodec
Change AVSubtitle.rects to an array of pointers so ABI does not break
when the size of AVSubtitleRect changes.
author | michael |
---|---|
date | Sat, 03 Jan 2009 17:54:48 +0000 |
parents | e943e1409077 |
children | 315b302fcd1d |
line wrap: on
line diff
--- a/dvdsubenc.c Sat Jan 03 15:15:03 2009 +0000 +++ b/dvdsubenc.c Sat Jan 03 17:54:48 2009 +0000 @@ -108,10 +108,10 @@ cmap[i] = 0; } for (object_id = 0; object_id < rects; object_id++) - for (i=0; i<h->rects[object_id].w*h->rects[object_id].h; ++i) { - color = h->rects[object_id].bitmap[i]; + for (i=0; i<h->rects[object_id]->w*h->rects[object_id]->h; ++i) { + color = h->rects[object_id]->bitmap[i]; // only count non-transparent pixels - alpha = h->rects[object_id].rgba_palette[color] >> 24; + alpha = h->rects[object_id]->rgba_palette[color] >> 24; hist[color] += alpha; } for (color=3;; --color) { @@ -138,19 +138,19 @@ for (object_id = 0; object_id < rects; object_id++) { offset1[object_id] = q - outbuf; // worst case memory requirement: 1 nibble per pixel.. - if ((q - outbuf) + h->rects[object_id].w*h->rects[object_id].h/2 + if ((q - outbuf) + h->rects[object_id]->w*h->rects[object_id]->h/2 + 17*rects + 21 > outbuf_size) { av_log(NULL, AV_LOG_ERROR, "dvd_subtitle too big\n"); return -1; } - dvd_encode_rle(&q, h->rects[object_id].bitmap, - h->rects[object_id].w*2, - h->rects[object_id].w, h->rects[object_id].h >> 1, + dvd_encode_rle(&q, h->rects[object_id]->bitmap, + h->rects[object_id]->w*2, + h->rects[object_id]->w, h->rects[object_id]->h >> 1, cmap); offset2[object_id] = q - outbuf; - dvd_encode_rle(&q, h->rects[object_id].bitmap + h->rects[object_id].w, - h->rects[object_id].w*2, - h->rects[object_id].w, h->rects[object_id].h >> 1, + dvd_encode_rle(&q, h->rects[object_id]->bitmap + h->rects[object_id]->w, + h->rects[object_id]->w*2, + h->rects[object_id]->w, h->rects[object_id]->h >> 1, cmap); } @@ -170,17 +170,17 @@ // XXX not sure if more than one rect can really be encoded.. // 12 bytes per rect for (object_id = 0; object_id < rects; object_id++) { - int x2 = h->rects[object_id].x + h->rects[object_id].w - 1; - int y2 = h->rects[object_id].y + h->rects[object_id].h - 1; + int x2 = h->rects[object_id]->x + h->rects[object_id]->w - 1; + int y2 = h->rects[object_id]->y + h->rects[object_id]->h - 1; *q++ = 0x05; // x1 x2 -> 6 nibbles - *q++ = h->rects[object_id].x >> 4; - *q++ = (h->rects[object_id].x << 4) | ((x2 >> 8) & 0xf); + *q++ = h->rects[object_id]->x >> 4; + *q++ = (h->rects[object_id]->x << 4) | ((x2 >> 8) & 0xf); *q++ = x2; // y1 y2 -> 6 nibbles - *q++ = h->rects[object_id].y >> 4; - *q++ = (h->rects[object_id].y << 4) | ((y2 >> 8) & 0xf); + *q++ = h->rects[object_id]->y >> 4; + *q++ = (h->rects[object_id]->y << 4) | ((y2 >> 8) & 0xf); *q++ = y2; *q++ = 0x06;