From patchwork Sun Aug 28 21:19:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37532 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp1584894pzh; Sun, 28 Aug 2022 14:21:44 -0700 (PDT) X-Google-Smtp-Source: AA6agR448dIGTQakdJAEQZtbAOE0LeEliCwgVjF5ZHtgETJdidvshzpXL18oh5+NrDrqaeW0fI+n X-Received: by 2002:a17:906:8475:b0:740:2574:1f04 with SMTP id hx21-20020a170906847500b0074025741f04mr7742943ejc.394.1661721704163; Sun, 28 Aug 2022 14:21:44 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g19-20020a170906521300b0073854628bd4si4624593ejm.76.2022.08.28.14.21.43; Sun, 28 Aug 2022 14:21:44 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=e67XA3iZ; arc=fail (body hash mismatch); 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3E9A268BA0C; Mon, 29 Aug 2022 00:20:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2104.outbound.protection.outlook.com [40.92.90.104]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ED88468BA38 for ; Mon, 29 Aug 2022 00:20:25 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PrFCCt8LxoZUsCLkVHLgwFJ39UXHE0SRs0V5RsvyLyjrgcIbWRR3c1ggNQjcaQ2vzaZviwWabfPJgLjkYFIJ2Enrp2Vlkz6YIjiRgu0Otp+k/JostkahiRMmiaq/VvT2z7uOUQX82qiyTVzmqCM+Wu6+ZUyWKE7xIo1W5iDDrpVunrtDZyBMZtoUDzCqu5E4knQ4ABcFVVpoxOYdZnUNwi9mM1H9nXBpOAeUz9em9ThfCZUheUFa26aUwgwbyKYGFEuTlmIke83ICoSoEg0WE1lAqN1UczrYmN899wiNjvkGFIWZ2zoyHTJPkVi7FmgSkvMSm/9RI+4F4+kuL7d8aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=o64KmZP8TDylg3zvOPYRh6JXWyNLxR6N2Hsd+udK50Y=; b=ZpwEjcmOBgNfaNNc5htUfvzO1jIvjIbFptsp5eVnRPTrVZt3cTf3Ot9Z9Dv3BQsiFhloHodCTvg4+y1vaXGyhYMAMLCOjCCi3tEshvBR88NwtikYzPcvZgpqfKoA5Rh8F78M+m9gZgBskzqd5Z4pkW0OTKWAPpwN9qCoc1y8icwud0ce4ihulyAe16nEP0D9Oo06I5uE7n5p9JHsZc9hgKY4vHdHKuLWEpUU7AaQ+aWnGagJGk423nVPhxuIVO1uxYciBbhAhgFw0NSxmQ1ZgRjUsWrxHqLYYjlzxTkB3sVGZUsmGF5yHTeTOKHcdKXTuXUP1WqkRyptIm2nbjHnHA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=o64KmZP8TDylg3zvOPYRh6JXWyNLxR6N2Hsd+udK50Y=; b=e67XA3iZ6xHz7a2Ffa6GDnmxfFZ2/x7dfOSYjEe2AzlE3uqQbOdh2KAFOLOaDGPpY1YBWgGd5a+drwdBB4QoO+jZnBlfbMfKXd6HsFObtT4nLlLbPHlVS4uOB0vNZz2cFMOXRcCs2bJm4W5RWVPPkBWNO98PHO6RWJiqR8Pb4JK6ZVoVpcqhLom02nfgxdmHP0XSCDFQ6kHoqIbjZpJtVEJLtlgwHjipgP7rw6usWT0MOODsdQDbN5NipT+en8+czzFSlPN1IpVemdA4IK3kMTWmURlRYtJWnOBrZpbrZzBu/OlR/iJQgtoYOGzYkBXj1SIbMiwUazoWTWxrKVIITg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU0P250MB0747.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3cb::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5566.15; Sun, 28 Aug 2022 21:20:18 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::7d2a:d9d8:f384:4cee]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::7d2a:d9d8:f384:4cee%9]) with mapi id 15.20.5566.021; Sun, 28 Aug 2022 21:20:18 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 28 Aug 2022 23:19:52 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [H8dE8yxaUYa4tduujxgmwZDL73eU92vy] X-ClientProxiedBy: AS9PR06CA0114.eurprd06.prod.outlook.com (2603:10a6:20b:465::12) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20220828211957.472263-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 89ed6b68-73b5-4049-abd0-08da893b1b2b X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmrlP0uwnDwxs8RZ0OmP5JOd3UwMu1bftIOTBVdGrVMKPTr/dPgUoJ+KSfHNncmQaiqcGyLyg4adhScseBFwmqeJTeq7wliVYn7xC/R/SQreYXFuCy3YUcmYFqIXN+qCHFqrl1ncSlvF8q21eCu3RHZ5w4MYgEPHzkV7N0sNgh3N4QBWRrxS/Ozeay/yGNVofU2kCx4QcnkWpfXvf9Gf0sKAjn5aFe0D6fJhbbCOGMEdMyhJ8YjM+hSk3WVfnZ7JliQvH4/eZDOouFE6Zb2Ba2/hrd+711NzQaUp4Ai+jHMZdPllPoG1JCwI4xR1TCf2tvAE6FbyIEuUlQbSPgLG1db7GBHSNv6MatzgcwDJWXr7Gx+H0vEczm3MGlboMo1KI1SpK1RXkqFN5RmnefqjEv+ECEf1OsCb0e+NnImoBhAzYabTADV+P0IaZ8O126Urg1rZ6vtS3+Wz8HLc7lFBX7hV20zezDFznSsNi04DyLpNWM5CKiG2hwkYEu7tqcnmuP1fYDUT4leqGGSNxAjn9qtrPI13QEj09jiNH1711wja4zD1zxdOLfTqf/31cZ3kkShDfCmZ0luPXk2bihh+Cx2PMdb1zTgAvlHOJM16Zmw13YX6N6c+pxf+lR+oNtrXKf3J0wlE3QXMCWKEcLjHR5zvp1/+9EETg+RcKJS3EfUrtfmRh7eXiOxv723+Nwj3v0+O1pCOXYV8Vi7UF3TswfB1voAEfz0JFw/HBbCsCrCEJ5WVO3HyFFrHXz7B7/PjOLs= X-MS-TrafficTypeDiagnostic: DU0P250MB0747:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EuMB4sfFlBQE5FwJ4bborXU5Yi2ztJxM11Nf2kQB2rretXPQrSMloVQZ6AsocHUVUijkGRJFldydXdLcNFkmYXPa2JVikJ/oQi0fkfvzX08IhIfA42FPYP61caCNllfDcLYx/JfSfLecf5sUKdUl/8zdDKKlQLRuiso5907GJs0Mqxhh15yd8LWtn5WJn8e9tDuclpozHusZo9HDYYj+LOrFeSE7To6wLixb8ZjNQPy+wyDgO3drrr96X5sI8p+nBle4W7ErU4MMtBk8SixZRYrDoTy4yqxu/YiJlRHjxzt4wadusm2Vx9gNNRJ2c0TYLQeiKMiAkdnYY+svtvaF18oQRuIGJDlcSqaAehzn/FAn9th0cminLvkEb3g8qn9/73fo00f3jrnhOp85BmWeypDoCqNKNo5s5iiQAWgaNBnV4zMxQN+EtfFjwrTmnn6cxzu3AgzCSUFTUEOt76u0McOxlQaWTNTIaLrjIgHTM5v7f06xR5GPUVghHlJKZrY1Zf04ShA4VmaKhVfZiSLX2BCWbKUoBcgySrMSYnouAliQ+55cwzEFR5a+LfMBC0shgAU9XiuJz0UQdRXtCXcwgTvOsEkLX46Ndp7PQK2y6kHcPmn+TXpTDsMqwQyXMwm6CeYed80er88zSjQvblE6gg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: SKH124QU5v7lDBzKPFehJlhjOCgoQOk/U4da8WSkv2GkjlJ6CFqBnM+h54kag8GyOVj3GfS7p4jWDURKwZp1QZbAM3/M806zXEC+6lxfzh/2ECu+3uUeTW58GkQOY83EOyI8jcSOTIBqZPGhKtXlfOMuPmjAlq0ddRHE4SGp65nmyRrc/qIIa3n+Mr1gH6ze7UgTTlBX9VfoNxVtG4lZB98yFLO2nUJnLt5F/9SWPowlNk2Nz5UDBebDtz6VkuiWSBqmTDrTeXrprXIoeM2yQA61H1gnuD0Z8oVpBHTF/LaX05q046u+1V/rObiEz2TcA4CpzFwOEaSKL9Yu/XdvpXiQMiHWZqB9Jb+QwnD/Ya0THQOHdUMlHhEOjXFHREV8STBtSr/sTsf9cMRfdVShG8qiCvR75kMbTIFmfdQsYfRnHo0geXvx2KfrXK6O2uxoLA5gUUrJM98fdvrb2vhwwwtURnGdEQYDYdRUHL2KlDeEzhdV919R6SIKM6PzHfLLx3aeleMyQqos/l505YLku7MFSGCOGs4sUxVxjqsluhl6zfbgmduS19SxVpnpUnAzCGMxriGezFDuWeBf2FIbxm5B6zd7BZ9hl8L+als/aL1bvyx4KwPoUtF5XhksjvJwT5rrqSQ3ymzmTG37U+PTTwJs8tO7UjMfeGmDkpnJbJanNa0v3WYXBAUDL6ztk/ktRgVSYqP/6CPv/L2JyPZB8JjHR9oVVCn1+6bfhWbHd8Qn4PgzsAaVJgA1iCbLB4hPpJNd4avwKVfAbvv7ei55RVTN8N5/84Bux50T7KI5eiWDqNqTZkY1XoYQxEheEpB9BDhYGg+bsQTxiQdBeTk2dpU9RSjA0FUOb8k63P8nudsOUsK8foeAhFDh2PI6/WU628heV+2vDby+e47KJNAEFJTfULP3bRSYTuIVHrCSvAEMybhqDP23G/lP09NJ6tk1NHBgQIs0ZjBXgMoR7yQqSf3q+6tPm8lfGes5GwXOfRs9zDEbmW0lEwuE+Rc5sLFRA4JOQtBXtOwUqbi6QnLLjvB+gaU4SNj/mNBV91mdFzOl873uysUComtBG6c57+KRsv1QyaEz7+NYI3m24j816lE+FyORC+g1/dVPPflmJ38FO52v2a7XAmKB+xae2mqTsB3fzj1jvkCl1O9vU/AEA/Z2EaLvwOgReFIVsjgMeb2myjI4mCexVk9pi+f8QiPpOniUh9OotGT5/So4h5T/aJENZajlKrZbB7gj5q4DxCpKQT24MsE+gTDDm361fgW4ZG/TOJYzjQYqsbVJYhOr6AlNQsJ/IKd+uR+eeTSOJZg= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 89ed6b68-73b5-4049-abd0-08da893b1b2b X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Aug 2022 21:20:17.9986 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0P250MB0747 Subject: [FFmpeg-devel] [PATCH 06/11] avcodec/flac: Remove unused parameter from ff_flac_is_extradata_valid() 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: KkKOsCsN0S34 format is write-only. Signed-off-by: Andreas Rheinhardt --- libavcodec/flac.c | 3 --- libavcodec/flac.h | 6 ------ libavcodec/flacdec.c | 3 +-- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/libavcodec/flac.c b/libavcodec/flac.c index 03c7bfb9e6..1da8aed21b 100644 --- a/libavcodec/flac.c +++ b/libavcodec/flac.c @@ -146,7 +146,6 @@ int ff_flac_decode_frame_header(AVCodecContext *avctx, GetBitContext *gb, } int ff_flac_is_extradata_valid(AVCodecContext *avctx, - enum FLACExtradataFormat *format, uint8_t **streaminfo_start) { if (!avctx->extradata || avctx->extradata_size < FLAC_STREAMINFO_SIZE) { @@ -159,14 +158,12 @@ int ff_flac_is_extradata_valid(AVCodecContext *avctx, av_log(avctx, AV_LOG_WARNING, "extradata contains %d bytes too many.\n", FLAC_STREAMINFO_SIZE-avctx->extradata_size); } - *format = FLAC_EXTRADATA_FORMAT_STREAMINFO; *streaminfo_start = avctx->extradata; } else { if (avctx->extradata_size < 8+FLAC_STREAMINFO_SIZE) { av_log(avctx, AV_LOG_ERROR, "extradata too small.\n"); return 0; } - *format = FLAC_EXTRADATA_FORMAT_FULL_HEADER; *streaminfo_start = &avctx->extradata[8]; } return 1; diff --git a/libavcodec/flac.h b/libavcodec/flac.h index 239e842716..7d6286bf0f 100644 --- a/libavcodec/flac.h +++ b/libavcodec/flac.h @@ -55,11 +55,6 @@ enum { FLAC_METADATA_TYPE_INVALID = 127 }; -enum FLACExtradataFormat { - FLAC_EXTRADATA_FORMAT_STREAMINFO = 0, - FLAC_EXTRADATA_FORMAT_FULL_HEADER = 1 -}; - #define FLACCOMMONINFO \ int samplerate; /**< sample rate */\ int channels; /**< number of channels */\ @@ -106,7 +101,6 @@ int ff_flac_parse_streaminfo(AVCodecContext *avctx, struct FLACStreaminfo *s, * @return 1 if valid, 0 if not valid. */ int ff_flac_is_extradata_valid(AVCodecContext *avctx, - enum FLACExtradataFormat *format, uint8_t **streaminfo_start); /** diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c index 3b16426e73..23e9eba4ad 100644 --- a/libavcodec/flacdec.c +++ b/libavcodec/flacdec.c @@ -94,7 +94,6 @@ static void flac_set_bps(FLACContext *s) static av_cold int flac_decode_init(AVCodecContext *avctx) { - enum FLACExtradataFormat format; uint8_t *streaminfo; int ret; FLACContext *s = avctx->priv_data; @@ -105,7 +104,7 @@ static av_cold int flac_decode_init(AVCodecContext *avctx) if (!avctx->extradata) return 0; - if (!ff_flac_is_extradata_valid(avctx, &format, &streaminfo)) + if (!ff_flac_is_extradata_valid(avctx, &streaminfo)) return AVERROR_INVALIDDATA; /* initialize based on the demuxer-supplied streamdata header */