ffmpeg | branch: master | Andreas Rheinhardt <[email protected]> | Wed Jul 29 22:00:31 2020 +0200| [056a8fc07133148f6cb1f2ea157a6b91c33e5b02] | committer: Andreas Rheinhardt
avcodec/smacker: Forward error codes Reviewed-by: Paul B Mahol <[email protected]> Signed-off-by: Andreas Rheinhardt <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=056a8fc07133148f6cb1f2ea157a6b91c33e5b02 --- libavcodec/smacker.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c index 07fa8887d8..9ba70af6f7 100644 --- a/libavcodec/smacker.c +++ b/libavcodec/smacker.c @@ -653,18 +653,15 @@ static int smka_decode_frame(AVCodecContext *avctx, void *data, goto error; } skip_bits1(&gb); - if (smacker_decode_tree(&gb, &h[i], 0, 0) < 0) { - ret = AVERROR_INVALIDDATA; + if ((ret = smacker_decode_tree(&gb, &h[i], 0, 0)) < 0) goto error; - } skip_bits1(&gb); if(h[i].current > 1) { - res = init_vlc(&vlc[i], SMKTREE_BITS, h[i].length, + ret = init_vlc(&vlc[i], SMKTREE_BITS, h[i].length, h[i].lengths, sizeof(int), sizeof(int), h[i].bits, sizeof(uint32_t), sizeof(uint32_t), INIT_VLC_LE); - if(res < 0) { + if (ret < 0) { av_log(avctx, AV_LOG_ERROR, "Cannot build VLC table\n"); - ret = AVERROR_INVALIDDATA; goto error; } } _______________________________________________ ffmpeg-cvslog mailing list [email protected] https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email [email protected] with subject "unsubscribe".
