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

lavc/samidec: properly raise errors from sami_paragraph_to_ass()

Browse Source
This commit is contained in:
Clément Bœsch 2017-11-29 22:23:36 +01:00
parent 61bbc537ab
commit 8d51d10eb8
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/samidec.c
View File

@ -138,9 +138,12 @@ static int sami_decode_frame(AVCodecContext *avctx,
const char *ptr = avpkt->data; const char *ptr = avpkt->data;
SAMIContext *sami = avctx->priv_data; SAMIContext *sami = avctx->priv_data;
if (ptr && avpkt->size > 0 && !sami_paragraph_to_ass(avctx, ptr)) { if (ptr && avpkt->size > 0) {
int ret = sami_paragraph_to_ass(avctx, ptr);
if (ret < 0)
return ret;
// TODO: pass escaped sami->encoded_source.str as source // TODO: pass escaped sami->encoded_source.str as source
int ret = ff_ass_add_rect(sub, sami->full.str, sami->readorder++, 0, NULL, NULL); ret = ff_ass_add_rect(sub, sami->full.str, sami->readorder++, 0, NULL, NULL);
if (ret < 0) if (ret < 0)
return ret; return ret;
} }