ffmpeg | branch: master | Clément Bœsch <u...@pkh.me> | Wed Nov 29 22:23:36 2017 +0100| [8d51d10eb895bda02ab0f8b3af082b5c9a781690] | committer: Clément Bœsch
lavc/samidec: properly raise errors from sami_paragraph_to_ass() > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8d51d10eb895bda02ab0f8b3af082b5c9a781690 --- libavcodec/samidec.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavcodec/samidec.c b/libavcodec/samidec.c index 6a598060ef..e32f238c62 100644 --- a/libavcodec/samidec.c +++ b/libavcodec/samidec.c @@ -138,9 +138,12 @@ static int sami_decode_frame(AVCodecContext *avctx, const char *ptr = avpkt->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 - 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) return ret; } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
