From 684e501cb9f1fb001228770d4e892f647de15202 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Thu, 4 Mar 2021 09:32:21 +0100 Subject: [PATCH] avcodec/decode: Return early upon failure Allows to remove one level of indentation. Reviewed-by: James Almer Signed-off-by: Andreas Rheinhardt --- libavcodec/decode.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 5e5d0c70660..db6ee9cb042 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -1043,9 +1043,9 @@ int avcodec_decode_subtitle2(AVCodecContext *avctx, AVSubtitle *sub, AVPacket pkt_recoded = *avpkt; ret = recode_subtitle(avctx, &pkt_recoded, avpkt); - if (ret < 0) { - *got_sub_ptr = 0; - } else { + if (ret < 0) + return ret; + ret = extract_packet_props(avctx->internal, &pkt_recoded); if (ret < 0) return ret; @@ -1099,7 +1099,6 @@ int avcodec_decode_subtitle2(AVCodecContext *avctx, AVSubtitle *sub, av_packet_unref(&pkt_recoded); } - } if (*got_sub_ptr) avctx->frame_number++; -- 2.39.2