highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/decode: Return early upon failure

Browse Source 
Allows to remove one level of indentation.

Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt
2021-03-04 09:32:21 +01:00
parent 94bf3f90e9
commit 684e501cb9
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/decode.c
View File

@@ -1043,9 +1043,9 @@ int avcodec_decode_subtitle2(AVCodecContext *avctx, AVSubtitle *sub,
AVPacket pkt_recoded = *avpkt; AVPacket pkt_recoded = *avpkt;
ret = recode_subtitle(avctx, &pkt_recoded, avpkt); ret = recode_subtitle(avctx, &pkt_recoded, avpkt);
if (ret < 0) { if (ret < 0)
*got_sub_ptr = 0; return ret;
} else {
ret = extract_packet_props(avctx->internal, &pkt_recoded); ret = extract_packet_props(avctx->internal, &pkt_recoded);
if (ret < 0) if (ret < 0)
return ret; return ret;
@@ -1099,7 +1099,6 @@ int avcodec_decode_subtitle2(AVCodecContext *avctx, AVSubtitle *sub,
av_packet_unref(&pkt_recoded); av_packet_unref(&pkt_recoded);
} }
}
if (*got_sub_ptr) if (*got_sub_ptr)
avctx->frame_number++; avctx->frame_number++;