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

avcodec/vp9: Cleanup generically on init failure

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2021-05-05 21:18:45 +02:00
parent 4848a7abff
commit 3572590e75
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/vp9.c
View File

@ -1798,7 +1798,6 @@ static int init_frames(AVCodecContext *avctx)
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
s->s.frames[i].tf.f = av_frame_alloc(); s->s.frames[i].tf.f = av_frame_alloc();
if (!s->s.frames[i].tf.f) { if (!s->s.frames[i].tf.f) {
vp9_decode_free(avctx);
av_log(avctx, AV_LOG_ERROR, "Failed to allocate frame buffer %d\n", i); av_log(avctx, AV_LOG_ERROR, "Failed to allocate frame buffer %d\n", i);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
@ -1807,7 +1806,6 @@ static int init_frames(AVCodecContext *avctx)
s->s.refs[i].f = av_frame_alloc(); s->s.refs[i].f = av_frame_alloc();
s->next_refs[i].f = av_frame_alloc(); s->next_refs[i].f = av_frame_alloc();
if (!s->s.refs[i].f || !s->next_refs[i].f) { if (!s->s.refs[i].f || !s->next_refs[i].f) {
vp9_decode_free(avctx);
av_log(avctx, AV_LOG_ERROR, "Failed to allocate frame buffer %d\n", i); av_log(avctx, AV_LOG_ERROR, "Failed to allocate frame buffer %d\n", i);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
@ -1883,7 +1881,8 @@ const AVCodec ff_vp9_decoder = {
.close = vp9_decode_free, .close = vp9_decode_free,
.decode = vp9_decode_frame, .decode = vp9_decode_frame,
.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_SLICE_THREADS, .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_SLICE_THREADS,
.caps_internal = FF_CODEC_CAP_SLICE_THREAD_HAS_MF | .caps_internal = FF_CODEC_CAP_INIT_CLEANUP |
FF_CODEC_CAP_SLICE_THREAD_HAS_MF |
FF_CODEC_CAP_ALLOCATE_PROGRESS, FF_CODEC_CAP_ALLOCATE_PROGRESS,
.flush = vp9_decode_flush, .flush = vp9_decode_flush,
.update_thread_context = ONLY_IF_THREADS_ENABLED(vp9_decode_update_thread_context), .update_thread_context = ONLY_IF_THREADS_ENABLED(vp9_decode_update_thread_context),