videolan/ffmpeg
1
Fork 0
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-09-29 00:10:04 +02:00
Code Releases Activity

avcodec/interplayvideo: Cleanup generically after init failure

Browse Source 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2020-08-29 08:43:42 +02:00
parent 3c7ca68eeb
commit 35b478de5b
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/interplayvideo.c
View File

@ -1160,7 +1160,6 @@ static void ipvideo_decode_format_11_opcodes(IpvideoContext *s, AVFrame *frame)
static av_cold int ipvideo_decode_init(AVCodecContext *avctx)
{
IpvideoContext *s = avctx->priv_data;
int ret;
s->avctx = avctx;
@ -1175,8 +1174,7 @@ static av_cold int ipvideo_decode_init(AVCodecContext *avctx)
s->prev_decode_frame = av_frame_alloc();
if (!s->last_frame || !s->second_last_frame ||
!s->cur_decode_frame || !s->prev_decode_frame) {
ret = AVERROR(ENOMEM);
goto error;
return AVERROR(ENOMEM);
}
s->cur_decode_frame->width = avctx->width;
@ -1187,12 +1185,6 @@ static av_cold int ipvideo_decode_init(AVCodecContext *avctx)
s->prev_decode_frame->format = avctx->pix_fmt;
return 0;
error:
av_frame_free(&s->last_frame);
av_frame_free(&s->second_last_frame);
av_frame_free(&s->cur_decode_frame);
av_frame_free(&s->prev_decode_frame);
return ret;
}
static int ipvideo_decode_frame(AVCodecContext *avctx,
@ -1381,4 +1373,5 @@ AVCodec ff_interplay_video_decoder = {
.close = ipvideo_decode_end,
.decode = ipvideo_decode_frame,
.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_PARAM_CHANGE,
.caps_internal = FF_CODEC_CAP_INIT_CLEANUP,
};