ffmpeg | branch: master | Zhao Zhili <zhiliz...@tencent.com> | Sun Jul 7 18:21:30 2024 +0800| [2eae57c8627bc7e8e767558606c9df46852be751] | committer: Zhao Zhili
avcodec/videotoolboxenc: Don't ignore ENOMEM Signed-off-by: Zhao Zhili <zhiliz...@tencent.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2eae57c8627bc7e8e767558606c9df46852be751 --- libavcodec/videotoolboxenc.c | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c index bc505abee4..432c393989 100644 --- a/libavcodec/videotoolboxenc.c +++ b/libavcodec/videotoolboxenc.c @@ -2585,14 +2585,13 @@ static int vtenc_send_frame(AVCodecContext *avctx, if (vtctx->a53_cc && side_data && side_data->size) { sei = av_mallocz(sizeof(*sei)); if (!sei) { - av_log(avctx, AV_LOG_ERROR, "Not enough memory for closed captions, skipping\n"); - } else { - int ret = ff_alloc_a53_sei(frame, 0, &sei->data, &sei->size); - if (ret < 0) { - av_log(avctx, AV_LOG_ERROR, "Not enough memory for closed captions, skipping\n"); - av_free(sei); - sei = NULL; - } + status = AVERROR(ENOMEM); + goto out; + } + status = ff_alloc_a53_sei(frame, 0, &sei->data, &sei->size); + if (status < 0) { + av_free(sei); + goto out; } } #endif @@ -2608,15 +2607,19 @@ static int vtenc_send_frame(AVCodecContext *avctx, NULL ); - if (frame_dict) CFRelease(frame_dict); - CFRelease(cv_img); - if (status) { av_log(avctx, AV_LOG_ERROR, "Error: cannot encode frame: %d\n", status); - return AVERROR_EXTERNAL; + status = AVERROR_EXTERNAL; + // Not necessary, just in case new code put after here + goto out; } - return 0; +out: + if (frame_dict) + CFRelease(frame_dict); + CFRelease(cv_img); + + return status; } static av_cold int vtenc_frame( _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
