From patchwork Thu May 28 13:57:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19934 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 457BF44A156 for ; Thu, 28 May 2020 16:57:57 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2BEF568AEBC; Thu, 28 May 2020 16:57:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 39A1B68AF04 for ; Thu, 28 May 2020 16:57:49 +0300 (EEST) Received: by mail-pg1-f196.google.com with SMTP id w20so8479885pga.6 for ; Thu, 28 May 2020 06:57:49 -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=wkKKFaNOO5ZiI1YFSNGkxWC5j6DSs8zlYoaL/8VeJWQ=; b=lheLN1r79wrVLxqIQJc7xORNCXvdLXmFtQ6nbry4+wcvPq6ugW5c5IvwFnQqjujRyx IQSEISnHICmi/KOfezrJkXZv65KY330RCezBG/kmbuNRn0Rb14Rwb4WkPlX0CkTcNfYf hhN+7UW9oJBgrihhRCum1ZnWSW1SBmMHNkQcsWz2Imr0ZuMk1j6YvMWZ8G8YDoxZ/0vO KVv+ZY0GphDfRYEhM7Vyuv0GJntJXNBUVb5CuprquuaHO6vMgMhmqCMZ45P2PvslkIYL e/f8RUrmulhmLgShi/mWY0+C++0Dk1C9Ymu2H2n5IdVzgDpAbIIdwWUQ95Py30qDWjE5 2kbw== 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=wkKKFaNOO5ZiI1YFSNGkxWC5j6DSs8zlYoaL/8VeJWQ=; b=gBsFDH1IaTwp80m2+bh8Me+p+KpwJ/VR8PaOma3j4HD1Kr68klgkRkL8/v6ACzBpnZ S/Wyl+/XG11tn409/bxrC6uGTNKOzk/VUOUZoJcZmcZ5aTNFOmdwOJ7M+tThEPp6c1eg FBhPLZV/2eoJ6mvrK0lsrY2uA6odX+cmTvbVInxncknTswWreiCCLisWh6cEq9vnzWwx NqyamFnpuRoXoqOL3/6gmP2ykizRgme1oYuNLawcJJyfPYCnjkRG+aBVeDwxiEHZLbBr Dodu+pMD1TP+wu1XILJobyQEugDZeJc47lDSAkm4o6CoPhlNRhMPWWavv3iWRMPmJhnB i6lw== X-Gm-Message-State: AOAM532vFb39xxoV5S4PqhRTydbGzZchAkLMP5xwuQ2gVj6w4NgYFW9k RhE34Abc1h2cI9CwXIgcaX/5sK8x X-Google-Smtp-Source: ABdhPJyKh4TsqLoaSlkHAJp/nfABazk3sOUjjZBDgo3T4/A/72BhHqmNTeLiOQKlcxyhYBykLxk6Mw== X-Received: by 2002:a63:7f5d:: with SMTP id p29mr3000040pgn.337.1590674267398; Thu, 28 May 2020 06:57:47 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id x11sm1412118pfm.196.2020.05.28.06.57.46 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 May 2020 06:57:46 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 28 May 2020 21:57:30 +0800 Message-Id: <1590674250-32571-7-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1590674250-32571-1-git-send-email-lance.lmwang@gmail.com> References: <1590674250-32571-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 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 bcb6783..52f0f67 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[] = {