[FFmpeg-cvslog] avcodec/error_resilience: Deduplicate cleanup code
Andreas Rheinhardt
git at videolan.org
Wed Jun 12 14:15:56 EEST 2024
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Mon Apr 29 01:01:36 2024 +0200| [17501b22674ac738847e3d6057c69d0212fc6629] | committer: Andreas Rheinhardt
avcodec/error_resilience: Deduplicate cleanup code
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=17501b22674ac738847e3d6057c69d0212fc6629
---
libavcodec/error_resilience.c | 20 ++++++--------------
1 file changed, 6 insertions(+), 14 deletions(-)
diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c
index efbacb8760..66d03987b6 100644
--- a/libavcodec/error_resilience.c
+++ b/libavcodec/error_resilience.c
@@ -948,19 +948,10 @@ void ff_er_frame_end(ERContext *s, int *decode_error_flags)
s->ref_index[i] = av_calloc(s->mb_stride * s->mb_height, 4 * sizeof(uint8_t));
s->motion_val_base[i] = av_calloc(size + 4, 2 * sizeof(uint16_t));
if (!s->ref_index[i] || !s->motion_val_base[i])
- break;
+ goto cleanup;
s->cur_pic.ref_index[i] = s->ref_index[i];
s->cur_pic.motion_val[i] = s->motion_val_base[i] + 4;
}
- if (i < 2) {
- for (i = 0; i < 2; i++) {
- av_freep(&s->ref_index[i]);
- av_freep(&s->motion_val_base[i]);
- s->cur_pic.ref_index[i] = NULL;
- s->cur_pic.motion_val[i] = NULL;
- }
- return;
- }
}
if (s->avctx->debug & FF_DEBUG_ER) {
@@ -1344,14 +1335,15 @@ void ff_er_frame_end(ERContext *s, int *decode_error_flags)
s->mbintra_table[mb_xy] = 1;
}
+ memset(&s->cur_pic, 0, sizeof(ERPicture));
+ memset(&s->last_pic, 0, sizeof(ERPicture));
+ memset(&s->next_pic, 0, sizeof(ERPicture));
+
+cleanup:
for (i = 0; i < 2; i++) {
av_freep(&s->ref_index[i]);
av_freep(&s->motion_val_base[i]);
s->cur_pic.ref_index[i] = NULL;
s->cur_pic.motion_val[i] = NULL;
}
-
- memset(&s->cur_pic, 0, sizeof(ERPicture));
- memset(&s->last_pic, 0, sizeof(ERPicture));
- memset(&s->next_pic, 0, sizeof(ERPicture));
}
More information about the ffmpeg-cvslog
mailing list