diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-22 21:18:03 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-22 21:41:53 +0200 |
| commit | ee573b4d31d49280df0fbec61af6184130d26737 (patch) | |
| tree | 46f462f7e70dadd32d21e932449cd3124404a7a2 /libavcodec/dvbsub.c | |
| parent | 37498a4b202e332e690ba02b9ab04afcbb08c9a5 (diff) | |
| parent | a17a7661906ba295d67afd80ac0770422e1b02b3 (diff) | |
| download | ffmpeg-ee573b4d31d49280df0fbec61af6184130d26737.tar.gz | |
Merge commit 'a17a7661906ba295d67afd80ac0770422e1b02b3'
* commit 'a17a7661906ba295d67afd80ac0770422e1b02b3':
lavc: Add data and linesize to AVSubtitleRect
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/dvbsub.c')
| -rw-r--r-- | libavcodec/dvbsub.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/dvbsub.c b/libavcodec/dvbsub.c index dd84a07664..3cdbade99c 100644 --- a/libavcodec/dvbsub.c +++ b/libavcodec/dvbsub.c @@ -315,7 +315,7 @@ static int encode_dvb_subtitles(DVBSubtitleContext *s, *q++ = (1 << (7 - bpp_index)) | (0xf << 1) | 1; /* 2 bits/pixel full range */ { int a, r, g, b; - uint32_t x= ((uint32_t*)h->rects[clut_id]->pict.data[1])[i]; + uint32_t x= ((uint32_t*)h->rects[clut_id]->data[1])[i]; a = (x >> 24) & 0xff; r = (x >> 16) & 0xff; g = (x >> 8) & 0xff; @@ -410,10 +410,10 @@ static int encode_dvb_subtitles(DVBSubtitleContext *s, q += 2; top_ptr = q; - dvb_encode_rle(&q, h->rects[object_id]->pict.data[0], h->rects[object_id]->w * 2, + dvb_encode_rle(&q, h->rects[object_id]->data[0], h->rects[object_id]->w * 2, h->rects[object_id]->w, h->rects[object_id]->h >> 1); bottom_ptr = q; - dvb_encode_rle(&q, h->rects[object_id]->pict.data[0] + h->rects[object_id]->w, + dvb_encode_rle(&q, h->rects[object_id]->data[0] + h->rects[object_id]->w, h->rects[object_id]->w * 2, h->rects[object_id]->w, h->rects[object_id]->h >> 1); |