Message ID | DB6PR0101MB2214BF3A558DB6E28EC1EBFA8FBA9@DB6PR0101MB2214.eurprd01.prod.exchangelabs.com |
---|---|
State | Accepted |
Commit | 03b2ed9a50dc6cbf332a2d93e4c8811b88e6df7f |
Headers | show |
Series | [FFmpeg-devel,1/3] avcodec/cbs_h2645: Remove unnecessary (h264|hevc)_sei.h inclusions | expand |
Context | Check | Description |
---|---|---|
yinshiyou/make_loongarch64 | success | Make finished |
yinshiyou/make_fate_loongarch64 | success | Make fate finished |
andriy/make_x86 | success | Make finished |
andriy/make_fate_x86 | success | Make fate finished |
andriy/make_armv7_RPi4 | success | Make finished |
andriy/make_fate_armv7_RPi4 | success | Make fate finished |
Quoting Andreas Rheinhardt (2022-06-30 10:51:56) > This function is only called from the decoder's init function > and given that this decoder has FF_CODEC_CAP_INIT_CLEANUP set, > hevc_decode_free() is called automatically (currently it would > be called twice with the second call being redundant). > > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> > --- > libavcodec/hevcdec.c | 16 ++++++---------- > 1 file changed, 6 insertions(+), 10 deletions(-) looks ok
diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 7ab012d68f..7037048d53 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -3647,34 +3647,34 @@ static av_cold int hevc_init_context(AVCodecContext *avctx) s->HEVClcList = av_mallocz(sizeof(HEVCLocalContext*) * s->threads_number); s->sList = av_mallocz(sizeof(HEVCContext*) * s->threads_number); if (!s->HEVClc || !s->HEVClcList || !s->sList) - goto fail; + return AVERROR(ENOMEM); s->HEVClcList[0] = s->HEVClc; s->sList[0] = s; s->cabac_state = av_malloc(HEVC_CONTEXTS); if (!s->cabac_state) - goto fail; + return AVERROR(ENOMEM); s->output_frame = av_frame_alloc(); if (!s->output_frame) - goto fail; + return AVERROR(ENOMEM); for (i = 0; i < FF_ARRAY_ELEMS(s->DPB); i++) { s->DPB[i].frame = av_frame_alloc(); if (!s->DPB[i].frame) - goto fail; + return AVERROR(ENOMEM); s->DPB[i].tf.f = s->DPB[i].frame; s->DPB[i].frame_grain = av_frame_alloc(); if (!s->DPB[i].frame_grain) - goto fail; + return AVERROR(ENOMEM); } s->max_ra = INT_MAX; s->md5_ctx = av_md5_alloc(); if (!s->md5_ctx) - goto fail; + return AVERROR(ENOMEM); ff_bswapdsp_init(&s->bdsp); @@ -3684,10 +3684,6 @@ static av_cold int hevc_init_context(AVCodecContext *avctx) ff_hevc_reset_sei(&s->sei); return 0; - -fail: - hevc_decode_free(avctx); - return AVERROR(ENOMEM); } #if HAVE_THREADS
This function is only called from the decoder's init function and given that this decoder has FF_CODEC_CAP_INIT_CLEANUP set, hevc_decode_free() is called automatically (currently it would be called twice with the second call being redundant). Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/hevcdec.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)