mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-03 05:10:03 +02:00
avcodec/pngdec: Cleanup generically on init failure
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
parent
c4d63dbc94
commit
10e520f1f1
@ -1698,11 +1698,8 @@ static av_cold int png_dec_init(AVCodecContext *avctx)
|
||||
s->avctx = avctx;
|
||||
s->last_picture.f = av_frame_alloc();
|
||||
s->picture.f = av_frame_alloc();
|
||||
if (!s->last_picture.f || !s->picture.f) {
|
||||
av_frame_free(&s->last_picture.f);
|
||||
av_frame_free(&s->picture.f);
|
||||
if (!s->last_picture.f || !s->picture.f)
|
||||
return AVERROR(ENOMEM);
|
||||
}
|
||||
|
||||
ff_pngdsp_init(&s->dsp);
|
||||
|
||||
@ -1743,7 +1740,7 @@ const AVCodec ff_apng_decoder = {
|
||||
.decode = decode_frame_apng,
|
||||
.update_thread_context = ONLY_IF_THREADS_ENABLED(update_thread_context),
|
||||
.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS /*| AV_CODEC_CAP_DRAW_HORIZ_BAND*/,
|
||||
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE |
|
||||
.caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP |
|
||||
FF_CODEC_CAP_ALLOCATE_PROGRESS,
|
||||
};
|
||||
#endif
|
||||
@ -1761,6 +1758,6 @@ const AVCodec ff_png_decoder = {
|
||||
.update_thread_context = ONLY_IF_THREADS_ENABLED(update_thread_context),
|
||||
.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS /*| AV_CODEC_CAP_DRAW_HORIZ_BAND*/,
|
||||
.caps_internal = FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM | FF_CODEC_CAP_INIT_THREADSAFE |
|
||||
FF_CODEC_CAP_ALLOCATE_PROGRESS,
|
||||
FF_CODEC_CAP_ALLOCATE_PROGRESS | FF_CODEC_CAP_INIT_CLEANUP,
|
||||
};
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user