From patchwork Fri May 29 05:02:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19960 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 476CB449F72 for ; Fri, 29 May 2020 08:02:58 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2C28368AF6D; Fri, 29 May 2020 08:02:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8777668AED0 for ; Fri, 29 May 2020 08:02:53 +0300 (EEST) Received: by mail-pf1-f194.google.com with SMTP id 131so650020pfv.13 for ; Thu, 28 May 2020 22:02:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=eo9HU4Y4mC5jANS0ZN8Kjh3wJ3n+rRE12I33nC5telE=; b=K5gskoaNwN/qjhOVFl2z1SaEq0O9BYcP3ieRG7bzpzohLuSJ4NbnY/6bPXsoY57wOh +Tszm+MUyiQIpRtchugC6eaZDgQtUPs0sNd4r05eCQnNroPjbBBJr23IW31tk+2owFie NDMCNtpnlWsrUM/E9kYFXXUycYusym0HAcLXU2CzPdCYL1rPf4QgEhrE3DH9rJEHWzL2 6HinJ3xSJZY+t4cHVZeOBwcZ6tMiEvtpPj3HRut7Zhnw3Joz968T1NyG7TOlJjs9hWJV O4wQxlLmP5Z3VpXfLJgAoDtBkB+dYOVRkBtvuR4Jt2iL0ISDe3OnXSvSCsz4TyBDLnJh SM7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=eo9HU4Y4mC5jANS0ZN8Kjh3wJ3n+rRE12I33nC5telE=; b=CgsQwyhbOpUiOq5jcNiQTPh+0RbQFzvn7ouyHXegZ7nHGWxw+xehnAXaEhyr+57e2c SG0pQj/rLOhy7as2afK8R1cv7LwscFZiX34LLIBiYmqoVP6L3X4gdd95TAPvnoSwQevN iRLwLaoA6/C/BDLkRVCz/tfMITl6RG+WwclwxFVXMxIRb13H3VB7aX5waid3rtbTxufB Sd61elrW4MXLkno7FKnuN5GO8s3FbxeGvJErDX9gbaz1mAOTpVAbKkDhDTiFC3oq/ZsW Fa/apKdOoylY/KxfuiePWSXFwLKdavD44QqWy8u3emFPrBqoSSrF5jV8PKc/KoGq9OXe lAcw== X-Gm-Message-State: AOAM530Txnm8SIBRt/dmQKRXi9C8LR5ZGa6271iFeve8D9ghg8U9J1oL KeZ8FNE+S0DSF5Mk3kxde8/rWyKk X-Google-Smtp-Source: ABdhPJzpt8EZd89l26nG/OBAhyHMZHk7c3aFG2tSFcyZu9tqAl4DXN//oDwQEChtDtyKS5d8icQy3A== X-Received: by 2002:a63:3c53:: with SMTP id i19mr6445798pgn.147.1590728571541; Thu, 28 May 2020 22:02:51 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id w73sm6351517pfd.113.2020.05.28.22.02.50 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 May 2020 22:02:51 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 May 2020 13:02:34 +0800 Message-Id: <1590728554-23471-7-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1590728554-23471-1-git-send-email-lance.lmwang@gmail.com> References: <1590674250-32571-1-git-send-email-lance.lmwang@gmail.com> <1590728554-23471-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 7/7] avcodec/adpcmenc: remove gotos and error label X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavcodec/adpcmenc.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c index bcb6783c0c..52f0f67958 100644 --- a/libavcodec/adpcmenc.c +++ b/libavcodec/adpcmenc.c @@ -65,7 +65,6 @@ static av_cold int adpcm_encode_init(AVCodecContext *avctx) ADPCMEncodeContext *s = avctx->priv_data; uint8_t *extradata; int i; - int ret = AVERROR(ENOMEM); if (avctx->channels > 2) { av_log(avctx, AV_LOG_ERROR, "only stereo or mono is supported\n"); @@ -120,7 +119,7 @@ static av_cold int adpcm_encode_init(AVCodecContext *avctx) avctx->bits_per_coded_sample = 4; avctx->block_align = BLKSIZE; if (!(avctx->extradata = av_malloc(32 + AV_INPUT_BUFFER_PADDING_SIZE))) - goto error; + return AVERROR(ENOMEM); avctx->extradata_size = 32; extradata = avctx->extradata; bytestream_put_le16(&extradata, avctx->frame_size); @@ -140,8 +139,7 @@ static av_cold int adpcm_encode_init(AVCodecContext *avctx) avctx->sample_rate != 44100) { av_log(avctx, AV_LOG_ERROR, "Sample rate must be 11025, " "22050 or 44100\n"); - ret = AVERROR(EINVAL); - goto error; + return AVERROR(EINVAL); } avctx->frame_size = 512 * (avctx->sample_rate / 11025); break; @@ -150,13 +148,10 @@ static av_cold int adpcm_encode_init(AVCodecContext *avctx) avctx->block_align = BLKSIZE; break; default: - ret = AVERROR(EINVAL); - goto error; + return AVERROR(EINVAL); } return 0; -error: - return ret; } static av_cold int adpcm_encode_close(AVCodecContext *avctx) @@ -725,8 +720,6 @@ static int adpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, avpkt->size = pkt_size; *got_packet_ptr = 1; return 0; -error: - return AVERROR(ENOMEM); } static const enum AVSampleFormat sample_fmts[] = {