From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 9E992492EA for ; Sun, 7 Jul 2024 10:22:36 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B0AB468DB38; Sun, 7 Jul 2024 13:22:04 +0300 (EEST) Received: from out203-205-251-73.mail.qq.com (out203-205-251-73.mail.qq.com [203.205.251.73]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C989468DA69 for ; Sun, 7 Jul 2024 13:21:46 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1720347696; bh=9XkA8NS0uRcnbbZKYZtKeB6aeunem06uAffdftD2i0s=; h=From:To:Cc:Subject:Date; b=goVP8RmksGlI9Q6rlegcXqkgQqUJcb4LkVW3P/7JEYW4Pp712ezDesxLDczb/Panf uLgV7T0JI9/mKtTLnJ0c8CDFwz0hEKqT3EMJYgzMS33sW3BjuSm7dkWVzvN+ReDNtv mdib8sYlP//8dUhWaxuaa3+BXfBLbH+RAJVbU9KY= Received: from ZHILIZHAO-MB1.tencent.com ([113.116.28.29]) by newxmesmtplogicsvrsza10-0.qq.com (NewEsmtp) with SMTP id 5633A86C; Sun, 07 Jul 2024 18:21:35 +0800 X-QQ-mid: xmsmtpt1720347695t7lzvx2rh Message-ID: X-QQ-XMAILINFO: MR/iVh5QLeieY7Y3CVPCVCPolBHj9nJJFiVdtf/ACkCop6YC74FbF2tZL3xpeY UgzeDGVsfnk68rq4T3HEfaMNMW3vnGrAqyaCnV/HYxyZo5thmSWVObWxNMt4vWL27Ruu0fZf9ReD zWhvxUXtHY9tUxY+EW5oFkr8/Sn2ymoBZ+en1gckV29kk5jNKy9/ceZeCcgONA0cHZzd1N0xzPyA yrfehsvFhvS4ZpOHH+NbiZeHaTicZvMYE5rMVKeLtJViX9Oh1/+MJcA9MIBW3/IoNJRX7Xcc67uO sfNifazyHe3+2NkmhsAP+5S8oN7ByY9OlsZdWz3kAb03KIGZt0Qz0rRJcNDeo2pT+WEU75X9dH4p NxS2AJAiT1s8jhMP+MDE/uImMCCXevK4JLiYJp+WpAo71odoriCw7l0nbAMEIWfzso1r/M/4VE4M OOPdJ1sd9PKI1C/hj2P2o0+mBE8A0FPMX4zZBiWG05Mm9Rt/dWK0K2TRTEGmbTI0l/iIldtJg0JH ApuUFdV0TnLp19Tv5KNUHQ62VCPjpriIKAWmWMayer2TUpjaJqAppXgasIRYE5+uujXmQhIvV4ot UVkhx6p1LBjdinJFkMUBrrZrY+vKj7PbQX6U0blDOpWCc83lBoN2Md8umSo7aDa4VpypbQAdXev3 bIXcM0k9OdGQVEOvxo7r0Y4wh/ISDpiTfAytEh6jNK1mkOqD/m4g6P/NdnMdzg7EJ91n8x9L5hEs vJUwu0WPBGtGpGozdWtlTcatTuhRNkMeEVDQkkTGZW0uTpsfq5L0WeUi3mBAjtK46BCBGqVEJDFw yClTY1IB4pxMp1X+yGO6s2NeMiaxvxuN6tvZT6BaPSSHGP9KbtTXUa0AofbRw0a3njtfHOTGmEFY nphxXRBf/YpktTOLosMk8vlQhpTFdE75GY3V5XEOdXIc/LqA0vzPHoKjbbcwKuMbZic3s8T8WLe1 3LrHcTnw0xuBrpLkoRJDf3qKkXadZ0 X-QQ-XMRINFO: MPJ6Tf5t3I/ycC2BItcBVIA= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sun, 7 Jul 2024 18:21:30 +0800 X-OQ-MSGID: <20240707102134.93935-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/5] avcodec/videotoolboxenc: Don't ignore ENOMEM X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Zhao Zhili Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: Zhao Zhili --- libavcodec/videotoolboxenc.c | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c index 42065cbcb3..91ee507050 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( -- 2.42.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".