From patchwork Sat Jul 18 00:19:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 21154 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 3FEF3449F78 for ; Sat, 18 Jul 2020 03:20:01 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2B04868B6DF; Sat, 18 Jul 2020 03:20:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f68.google.com (mail-ej1-f68.google.com [209.85.218.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 41B4168B6C0 for ; Sat, 18 Jul 2020 03:19:53 +0300 (EEST) Received: by mail-ej1-f68.google.com with SMTP id dp18so12650001ejc.8 for ; Fri, 17 Jul 2020 17:19: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 :mime-version:content-transfer-encoding; bh=e/PiQFA2jKGopHsCohVb0H2pmLpA+io8R0G9IPCx6CM=; b=Cqb1ceP8wgtwcNMGkfHelvEnbQ6oJ11yT5R1N//i7fBwBbrbHCW8e6rF2B/lSEPA0j vpdbPKS20wMM1SSZKMxNgkVL6M/coxtUO5iOpmorbFRMT90oEa7xv73WX+MsIHIZuCIl +7JdLN47cvGqOuN+lzfYvgsxNVT+iITQPbWUWbJibege6Cy6FxAo1b8jlWXk9MAAWhiH KPeYuvn75gdvLx90OUNqqEm9Sm0h/JolNy0XBPV90bkfPU0QhbaEO4Qh5SP0AAGtQMct hPGarwIvQ9FHiJYGuccEjEZ5tbdsMUgrAaniPxeI4UsFg8aKO0dbav+nybIoEmvd0WpD oZGw== 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=e/PiQFA2jKGopHsCohVb0H2pmLpA+io8R0G9IPCx6CM=; b=FVEvbkqaOM5gMg4smp0IXk9sR+mPbHEFF6RJxUmfYdSdQPUmhLZx8obl/0Wh6AacE1 C+gOOqyATsrbaSPwonrsAgU9G/8bgHkpMenZj0BA2WAKHLuxYhWJDT/t7fyKEfunTIbr 1htNIOsFZ+Qt5FemLwQM9xbDqVsNlxVgbZaqjzS5GGKK7cOE0RkPXXHSg5jOpXE4puKO Drb1+pUNoHz6G7JMuVQ1H6/WYuvKIglKhMBnpw69PJtysZN31xV5NPsAcVLmFSgr7CLE b4JxZ7GlSViXCPqzFU8xGeJOda62f7Ysf6m0jJetltWWSHbYidAYY/rj8RjZyLHMXIWX +ACA== X-Gm-Message-State: AOAM5300WOnFK7HPbxxlGts8Z/zvk74vPgCsUoXmyxR9i3gF3CFx2rNm Z1EnxisdjRuHYWcZsZPR2dVY8nyL X-Google-Smtp-Source: ABdhPJwTlUMDtrqJn0jj9vmCOSraotA37hwZst+qnzK/5cfF3SQo1PlyuJqaawO1AYnv8ZmI8+5l+g== X-Received: by 2002:a17:906:6a4f:: with SMTP id n15mr10798824ejs.378.1595031592477; Fri, 17 Jul 2020 17:19:52 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc10296.dynamic.kabel-deutschland.de. [188.193.2.150]) by smtp.gmail.com with ESMTPSA id y7sm9299001ejd.73.2020.07.17.17.19.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jul 2020 17:19:51 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 18 Jul 2020 02:19:23 +0200 Message-Id: <20200718001928.10603-5-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200718000636.2167-1-andreas.rheinhardt@gmail.com> References: <20200718000636.2167-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 06/11] avformat/daudenc: Return proper error codes instead if -1 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/daudenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/daudenc.c b/libavformat/daudenc.c index 0d8d830a67..b489659a80 100644 --- a/libavformat/daudenc.c +++ b/libavformat/daudenc.c @@ -25,7 +25,7 @@ static int daud_init(struct AVFormatContext *s) { AVCodecParameters *par = s->streams[0]->codecpar; if (par->channels!=6 || par->sample_rate!=96000) - return -1; + return AVERROR(EINVAL); return 0; } @@ -34,7 +34,7 @@ static int daud_write_packet(struct AVFormatContext *s, AVPacket *pkt) if (pkt->size > 65535) { av_log(s, AV_LOG_ERROR, "Packet size too large for s302m. (%d > 65535)\n", pkt->size); - return -1; + return AVERROR_INVALIDDATA; } avio_wb16(s->pb, pkt->size); avio_wb16(s->pb, 0x8010); // unknown