RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/mpeg12dec: do not discard older a53 captions 

Fixes #6105.
This commit is contained in:
Paul B Mahol 2020-06-20 15:02:48 +02:00
parent 00842b3a0d
commit 29ea4e1b3c
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libavcodec/mpeg12dec.c
View File

@ -2242,13 +2242,25 @@ static int mpeg_decode_a53_cc(AVCodecContext *avctx,
/* extract A53 Part 4 CC data */
int cc_count = p[5] & 0x1f;
if (cc_count > 0 && buf_size >= 7 + cc_count * 3) {
av_freep(&s1->a53_caption);
s1->a53_caption_size = cc_count * 3;
s1->a53_caption = av_malloc(s1->a53_caption_size);
if (s1->a53_caption && s1->a53_caption_size > 0) {
uint8_t *old_a53_caption = s1->a53_caption;
int old_a53_caption_size = s1->a53_caption_size;
s1->a53_caption_size = old_a53_caption_size + cc_count * 3;
s1->a53_caption = av_malloc(s1->a53_caption_size);
if (s1->a53_caption) {
memcpy(s1->a53_caption, old_a53_caption, old_a53_caption_size);
memcpy(s1->a53_caption + old_a53_caption_size, p + 7, cc_count * 3);
}
av_freep(&old_a53_caption);
} else {
s1->a53_caption_size = cc_count * 3;
s1->a53_caption = av_malloc(s1->a53_caption_size);
if (s1->a53_caption)
memcpy(s1->a53_caption, p + 7, s1->a53_caption_size);
}
if (!s1->a53_caption) {
s1->a53_caption_size = 0;
} else {
memcpy(s1->a53_caption, p + 7, s1->a53_caption_size);
}
avctx->properties |= FF_CODEC_PROPERTY_CLOSED_CAPTIONS;
}