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 92A99437CF for ; Tue, 28 Jun 2022 16:15:10 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8F1FB68B980; Tue, 28 Jun 2022 19:15:07 +0300 (EEST) Received: from smtpbg.qq.com (smtpbg136.qq.com [106.55.201.188]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9690D68B96D for ; Tue, 28 Jun 2022 19:14:59 +0300 (EEST) X-QQ-mid: bizesmtp72t1656432892ta8rjvfx Received: from localhost ( [114.245.19.167]) by bizesmtp.qq.com (ESMTP) with id ; Wed, 29 Jun 2022 00:14:52 +0800 (CST) X-QQ-SSF: 01100000002000Z0Z000B00A0000000 X-QQ-FEAT: glREbVAB0pLmG/Hobf4rPDUEhgu3M60S6ocHrOrhDLyo2N52e2aFUoqQ0drc5 sMbsznzk4yJ+HPnjT8gOtTIDUFXzHgorMjDbY0qgWv67zTvkPQsSnLrbWgnS80T07r1ndrP dYXKSmiBipomq+PYmX5j0GHTkC3uYzuUYUIZ7npmKcUmFr6CeT3wOAO71wIxJHC4ZGGUqR8 +7uEHVUgCKYf0HH9PtCRJZgconCXBbAa/FL7k1apokn89pz56Ooic4uEDi2YQH6wmR/jygt YCgsNjf1OZP/fugpW/6bNJfJtll4nFzWV6wsJZOhG9VpYy67JRnyqjg7Y= X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Wed, 29 Jun 2022 00:14:08 +0800 Message-Id: <20220628161408.15410-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgspam:qybgspam7 Subject: [FFmpeg-devel] [PATCH] avcodec/audiotoolboxenc: return AVERROR_EXTERNAL immediately when encode error 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: Steven Liu , 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: Just return AVERROR_EXTERNAL immediately when encode error. The other logic should keep the old behavior before commit 7c05b7951. Suggested-By: Zhao Zhili Signed-off-by: Steven Liu --- libavcodec/audiotoolboxenc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavcodec/audiotoolboxenc.c b/libavcodec/audiotoolboxenc.c index 00293154bf..8bbaabd960 100644 --- a/libavcodec/audiotoolboxenc.c +++ b/libavcodec/audiotoolboxenc.c @@ -554,13 +554,12 @@ static int ffat_encode(AVCodecContext *avctx, AVPacket *avpkt, avctx->frame_size, &avpkt->pts, &avpkt->duration); - ret = 0; } else if (ret && ret != 1) { av_log(avctx, AV_LOG_ERROR, "Encode error: %i\n", ret); - ret = AVERROR_EXTERNAL; + return AVERROR_EXTERNAL; } - return ret; + return 0; } static av_cold void ffat_encode_flush(AVCodecContext *avctx) -- 2.34.1 _______________________________________________ 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".