virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Fix decoding of DXSA subtitles.

Browse Source 
These have a DXSA tag and contain alpha in addition to
color values for palette.
This commit is contained in:
Alexandre Colucci 2011-04-27 18:39:57 +02:00 committed by Reimar Döffinger
parent f08d171caa
commit d6f910ea47
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/xsubdec.c
View File

@ -54,6 +54,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
int w, h, x, y, rlelen, i; int w, h, x, y, rlelen, i;
int64_t packet_time = 0; int64_t packet_time = 0;
GetBitContext gb; GetBitContext gb;
int has_alpha = avctx->codec_tag == MKTAG('D','X','S','A');
// check that at least header fits // check that at least header fits
if (buf_size < 27 + 7 * 2 + 4 * 3) { if (buf_size < 27 + 7 * 2 + 4 * 3) {
@ -100,8 +101,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
for (i = 0; i < sub->rects[0]->nb_colors; i++) for (i = 0; i < sub->rects[0]->nb_colors; i++)
((uint32_t*)sub->rects[0]->pict.data[1])[i] = bytestream_get_be24(&buf); ((uint32_t*)sub->rects[0]->pict.data[1])[i] = bytestream_get_be24(&buf);
// make all except background (first entry) non-transparent // make all except background (first entry) non-transparent
for (i = 1; i < sub->rects[0]->nb_colors; i++) for (i = 0; i < sub->rects[0]->nb_colors; i++)
((uint32_t*)sub->rects[0]->pict.data[1])[i] |= 0xff000000; ((uint32_t*)sub->rects[0]->pict.data[1])[i] |= (has_alpha ? *buf++ : (i ? 0xff : 0)) << 24;
// process RLE-compressed data // process RLE-compressed data
rlelen = FFMIN(rlelen, buf_end - buf); rlelen = FFMIN(rlelen, buf_end - buf);