From patchwork Thu Jan 5 11:07:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 39885 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp297526pzb; Thu, 5 Jan 2023 03:08:36 -0800 (PST) X-Google-Smtp-Source: AMrXdXuwdxoa4ZckT76wPbMnLDBgVHiUErRi2dbuG1KUbJMvnVfW+9rune+KnrzDIQ0n0GxCMQhX X-Received: by 2002:a17:907:a0cc:b0:78d:f455:b5fa with SMTP id hw12-20020a170907a0cc00b0078df455b5famr43435415ejc.58.1672916916526; Thu, 05 Jan 2023 03:08:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672916916; cv=none; d=google.com; s=arc-20160816; b=mKvjn0BbJlG4Gp4yu9ZRyda+IbFxn+mwQmIFHBvTo1RB3vqYuWBxkJgxK6L3uGXj+r HL2JBK/hmdvL5VlDB9UGKOZ+keRIafspS3sWNmNBkmZIutpOkRnqAmzyPIltBguX/hw9 l5vFDjgFTXPDq2AowLHj8JIpZHGpXC06dtYDPXAq1LrCeC5+e9RBnsKqLQ6PmxTX0IHP /Cu+l7u2uOtJcpKNbT+8Tib+IXs20KHa1YQT/Tk/YM8GXiVcBJLNG/2meYdLWlqK2vI+ nnpVFR6jbtNmESFxxJNJ2oRerx815Dty6tED0/lUyZPnF236rq9e7zgiB/RQ0NtKJyTn oeog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :delivered-to; bh=L8JjsVallWsGNYgypBqQAC8g44hgdIglHh90fUPIILk=; b=zpVk52jv09mLjB6w4yKuvF6512nKJxMc02JkeoBIgmu3pPlhHyWpvU30oXwfMxSM79 mlllrWfO8O3oXEYyfWqdigy4AJr7rWIeICn28qcUj+YR99NnBo/+x6Dwdkz9ChKEElgn lFwIS9glziiInvS9VvzqPjYt+fBu4o5K7UhCqogpwUJhxgsannZw8lcj4nt7afljEXvl hJo32R28Dni7uLLOs6boYhN6dxF9PKKW0Dv9VtZUgT6aKoTVaENX3bhVe1tVieb+h7VV Jfqx1j99LPXkMO8PmbyFeEccqD02fUPeMvdfBArDBvZ6tUuhseoRvTvvzrYS2uKQ7D5o 3zPA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ht11-20020a170907608b00b007c0e15d36b8si34304760ejc.732.2023.01.05.03.08.35; Thu, 05 Jan 2023 03:08:36 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ADD9F68BCC0; Thu, 5 Jan 2023 13:08:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 18BE168BC58 for ; Thu, 5 Jan 2023 13:08:01 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id D0C792404F7 for ; Thu, 5 Jan 2023 12:08:00 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id 4LT1VN1eYqO1 for ; Thu, 5 Jan 2023 12:07:58 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id C46362400F5 for ; Thu, 5 Jan 2023 12:07:58 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 870FE3A02AF for ; Thu, 5 Jan 2023 12:07:58 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Thu, 5 Jan 2023 12:07:53 +0100 Message-Id: <20230105110756.473-1-anton@khirnov.net> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/4] lavc/ac3dec: fail when the sample rate is unset 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: epGKD3SKJTIl --- libavcodec/ac3dec.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index 1f2949dcfd..0b120e6140 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -1716,6 +1716,11 @@ skip: avctx->bit_rate = s->bit_rate + s->prev_bit_rate; } + if (!avctx->sample_rate) { + av_log(avctx, AV_LOG_ERROR, "Could not determine the sample rate\n"); + return AVERROR_INVALIDDATA; + } + for (ch = 0; ch < EAC3_MAX_CHANNELS; ch++) extended_channel_map[ch] = ch;