virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avcodec/roqvideoenc: 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 09:05:17 +02:00
parent c38405c149
commit 7c8cf40adc
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/roqvideoenc.c
View File

@ -1004,10 +1004,8 @@ static av_cold int roq_encode_init(AVCodecContext *avctx)
enc->last_frame = av_frame_alloc(); enc->last_frame = av_frame_alloc();
enc->current_frame = av_frame_alloc(); enc->current_frame = av_frame_alloc();
if (!enc->last_frame || !enc->current_frame) { if (!enc->last_frame || !enc->current_frame)
roq_encode_end(avctx);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
}
enc->tmpData = av_malloc(sizeof(RoqTempdata)); enc->tmpData = av_malloc(sizeof(RoqTempdata));
@ -1024,10 +1022,8 @@ static av_cold int roq_encode_init(AVCodecContext *avctx)
av_malloc_array ((enc->width*enc->height/64), sizeof(motion_vect)); av_malloc_array ((enc->width*enc->height/64), sizeof(motion_vect));
if (!enc->tmpData || !enc->this_motion4 || !enc->last_motion4 || if (!enc->tmpData || !enc->this_motion4 || !enc->last_motion4 ||
!enc->this_motion8 || !enc->last_motion8) { !enc->this_motion8 || !enc->last_motion8)
roq_encode_end(avctx);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
}
return 0; return 0;
} }
@ -1135,4 +1131,5 @@ AVCodec ff_roq_encoder = {
.pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUVJ444P, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUVJ444P,
AV_PIX_FMT_NONE }, AV_PIX_FMT_NONE },
.priv_class = &roq_class, .priv_class = &roq_class,
.caps_internal = FF_CODEC_CAP_INIT_CLEANUP,
}; };