From patchwork Wed Oct 23 12:59:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 15915 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 1844044A928 for ; Wed, 23 Oct 2019 16:07:15 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 01B4868AD71; Wed, 23 Oct 2019 16:07:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BB70368A671 for ; Wed, 23 Oct 2019 16:07:07 +0300 (EEST) Received: by mail-wm1-f68.google.com with SMTP id v6so2609412wmj.0 for ; Wed, 23 Oct 2019 06:07:07 -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 :mime-version:content-transfer-encoding; bh=+49NsjKeebkyc65tSTqVGWSJ7IVTDhNunm1DN0UfJZk=; b=K1l1PKL8BqsGrzY0nU0Z3xVw0EQvchl8pYe6+rkfAJdHD7oyonaW5hKNscQHHl2xDg uhaSEdviOqhDbNf6urS4erSp/B//g3BtZcgy5gWkMoFQLTJhaMrE7VOWHS1aBwElrJJM zuy622DcFdKxYo3lhKIBQZrv36qvUYEPt7+g9BmNHmCXbrIREpYUcp4QtjsPC4V7kXJT ZNSMWQrcAMy+ECWMIYRmnxeebqK6cA8e0hZMY+vhwihxSGJHP2R7BmGTM8oFDWUIkRxT arUnejm3YtZvlL1iueOwDCpBT9ozg5LySdyrgi5xF3VJdv6r2gHcBb+ZMPJNPnOojsWH zDFw== 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:mime-version:content-transfer-encoding; bh=+49NsjKeebkyc65tSTqVGWSJ7IVTDhNunm1DN0UfJZk=; b=JOoZWgvUZL+rOPNi4wbHTMmstymBoKoVkih/aTyc+p0Xjsoysp34XhleOM837q8FTx hk5/vZhUqOxHJ+Ggz92ixYkmzH5ZHpJ/lWtxVaHKTDJrwCwa46VWUKkbNrqGYS6E5Fqp 2L+AireR09yBbSOpeMLY6CfjMXDK4lznINVYH+6OMo176qv6t7GdX0JCq+sqQS7DBq8S CiM2dNOuiS7rJveJxqAfjfRz0Amc2RhkIJmHd1v/Ffo1tyg0DlxL4haCmUfNTC/x+wy9 Ix1nP83rLC00khGJ4Mzde2cUI22U7Yt5NYUdn9bt59fo6NWv8w0rpLkBSprjDkFezzaT UQVg== X-Gm-Message-State: APjAAAWvFUaVc8kuI0LESy/kQsGY/WNMWMkLnJmczwA7wfSejA0uam34 4cy0s1g6cXjfzGnbZsNDbLjHz/lc X-Google-Smtp-Source: APXvYqxAWjyuCre4uJjf2br1ZDRh7zoIiO76y6XDHABarxNiJztFYgfaxkNNhnTWH7hiI6WlzRvuIg== X-Received: by 2002:a7b:cd83:: with SMTP id y3mr8476969wmj.150.1571836027115; Wed, 23 Oct 2019 06:07:07 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc08937.dynamic.kabel-deutschland.de. [188.192.137.55]) by smtp.gmail.com with ESMTPSA id c144sm5303125wmd.1.2019.10.23.06.07.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Oct 2019 06:07:06 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 23 Oct 2019 14:59:40 +0200 Message-Id: <20191023125944.10292-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191023125944.10292-1-andreas.rheinhardt@gmail.com> References: <20191023125944.10292-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/6] avformat/aiffenc: Use better error codes 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavformat/aiffenc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/aiffenc.c b/libavformat/aiffenc.c index 4f24c2a28c..acf7b62862 100644 --- a/libavformat/aiffenc.c +++ b/libavformat/aiffenc.c @@ -123,7 +123,7 @@ static int aiff_write_header(AVFormatContext *s) /* First verify if format is ok */ if (!par->codec_tag) - return -1; + return AVERROR(EINVAL); if (par->codec_tag != MKTAG('N','O','N','E')) aifc = 1; @@ -136,7 +136,7 @@ static int aiff_write_header(AVFormatContext *s) if (aifc) { // compressed audio if (!par->block_align) { av_log(s, AV_LOG_ERROR, "block align not set\n"); - return -1; + return AVERROR(EINVAL); } /* Version chunk */ ffio_wfourcc(pb, "FVER"); @@ -167,7 +167,7 @@ static int aiff_write_header(AVFormatContext *s) par->bits_per_coded_sample = av_get_bits_per_sample(par->codec_id); if (!par->bits_per_coded_sample) { av_log(s, AV_LOG_ERROR, "could not compute bits per sample\n"); - return -1; + return AVERROR(EINVAL); } if (!par->block_align) par->block_align = (par->bits_per_coded_sample * par->channels) >> 3;