virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avcodec/av1dec: Remove redundant second free

Browse Source 
The AV1 decoder has the FF_CODEC_CAP_INIT_CLEANUP flag set and yet
the decoder's close function is called manually on some error paths.
This is unnecessary and has been removed in this commit.

Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt
2020-09-13 21:35:12 +02:00
parent 92b578e1d6
commit 3e057dd8b1
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/av1dec.c
View File

@@ -480,7 +480,6 @@ static av_cold int av1_decode_init(AVCodecContext *avctx)
for (int i = 0; i < FF_ARRAY_ELEMS(s->ref); i++) { for (int i = 0; i < FF_ARRAY_ELEMS(s->ref); i++) {
s->ref[i].tf.f = av_frame_alloc(); s->ref[i].tf.f = av_frame_alloc();
if (!s->ref[i].tf.f) { if (!s->ref[i].tf.f) {
av1_decode_free(avctx);
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
"Failed to allocate reference frame buffer %d.\n", i); "Failed to allocate reference frame buffer %d.\n", i);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
@@ -489,7 +488,6 @@ static av_cold int av1_decode_init(AVCodecContext *avctx)
s->cur_frame.tf.f = av_frame_alloc(); s->cur_frame.tf.f = av_frame_alloc();
if (!s->cur_frame.tf.f) { if (!s->cur_frame.tf.f) {
av1_decode_free(avctx);
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
"Failed to allocate current frame buffer.\n"); "Failed to allocate current frame buffer.\n");
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
@@ -504,7 +502,7 @@ static av_cold int av1_decode_init(AVCodecContext *avctx)
avctx->extradata_size); avctx->extradata_size);
if (ret < 0) { if (ret < 0) {
av_log(avctx, AV_LOG_WARNING, "Failed to read extradata.\n"); av_log(avctx, AV_LOG_WARNING, "Failed to read extradata.\n");
goto end; return ret;
} }
seq = ((CodedBitstreamAV1Context *)(s->cbc->priv_data))->sequence_header; seq = ((CodedBitstreamAV1Context *)(s->cbc->priv_data))->sequence_header;