From patchwork Mon Sep 6 12:43:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30042 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3722362iov; Mon, 6 Sep 2021 05:44:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw4pAxL2D8Gs09ONE7XUMa1dOqVmH9E3piMYhXypgrVR6WLkuKX94LA3GOq9y0YbVi43Gl2 X-Received: by 2002:a17:906:5795:: with SMTP id k21mr13772158ejq.158.1630932272955; Mon, 06 Sep 2021 05:44:32 -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 mp19si8669504ejc.630.2021.09.06.05.44.32; Mon, 06 Sep 2021 05:44:32 -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=AMhGpGRg; 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 328EA68A675; Mon, 6 Sep 2021 15:43:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069046.outbound.protection.outlook.com [40.92.69.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B696868A60C for ; Mon, 6 Sep 2021 15:43:33 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oWJicEggjIjhrw6nMfL1Urf+rnsoYEB/KZKmOGscg0BgoZO5rIPDY5V9yufWOwPo3BNLpcxKhjzVuOoxZQWkm1nvanAsAWHgWkBIpfpeo36GfniCiiQR2/GK+OwU+B46+ag7+tpK6wJZm9W9Zzf6w2sCXkoyBKpBFoxSlsx9cjmI0RZYQNpqj41V1IkA+4F9GXfZvUq2gwFQ0VDe/3kSMK95z+T5b8ZDOKEf2UYDWSI0MP9OEPmGbh40kU0H30RXUOYDojfbVgcqu+tfP62CZmCajGJ03aT2JGJqd6I1EVq+WLFASeHK0ZHca+MKxVY5NKDXqeiS1ieq55ckplSWrw== 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; bh=SPHIRnrLPRcznzq5r5XxL7k9UM9+8NGQfG5kNSjABVs=; b=gTtt2NwRu75OKxGhGsxz9VXZCooMDDXGSumm8s3z0pHtm3TJLVh/uFkt1MBmrl0k8ZkEib2HKmcXwl0/P+KIbkO0LgFzs1vFb9u6cjf3m/Z8S+XU8a2viCElHEEppJIgAUQR1cdafCgia+jBjWSBYoL8WO0AZFC07B3mkuImQdNSTKGeDKtXRac+lxWD1Pwu4j22BzBqU/YSu6urALjqCON/Pfa8SLZ4Aj5nGJD9VRQifbwMcPcV3f4qJgXTCK7xatEKmAW2pD8Pwhpm+wJcKrabWjocan7yMRDnbbTvFwi8V3fIA3dlXLLtl0LoeCrl3HPD814hiUTulAt1l4ePpQ== 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=SPHIRnrLPRcznzq5r5XxL7k9UM9+8NGQfG5kNSjABVs=; b=AMhGpGRg2cnUQQEi+NVhh8URED94/sg1LgDpN9O3lICrDefpOT+PXoSj6GuSKGt1LDUfcz4uk4QVVkCXqbf/gxc7K6qedKgzNj/AZy12BbPqdhN4KlcSPj+sM1C0TD14moJI15Dhr/A/SOdv2JFz3Npcc56lWHpz1bLpWTOS7MqC/E7F3y0MVt6svnittoLbIQrWd1xrG8LK7gFipaYhM3UxE12+B7/fpPhZP/6nNhoI1OROQq3NGQleE/ISG7a8FkECQ6Y7rN7hsQBp9RBrPRz4kh7CE0cJOoxkINb7jNhCAM6sDKYI9XmaWkb6deYMyI+HIOVQ3iZX57FvM/FjTA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM5PR0301MB2515.eurprd03.prod.outlook.com (2603:10a6:203:8::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.21; Mon, 6 Sep 2021 12:43:20 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00%3]) with mapi id 15.20.4478.025; Mon, 6 Sep 2021 12:43:19 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Sep 2021 14:43:00 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [2MS2VEake59hxPJkUgiXUqTK2tSfrkKh] X-ClientProxiedBy: AM0PR01CA0084.eurprd01.prod.exchangelabs.com (2603:10a6:208:10e::25) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210906124301.4161498-9-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0PR01CA0084.eurprd01.prod.exchangelabs.com (2603:10a6:208:10e::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19 via Frontend Transport; Mon, 6 Sep 2021 12:43:19 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5034360b-0370-4a89-2acd-08d97133e7dd X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRm1SWGrcVu3yZ1k8RyeU252QoGQtekXJAatY+uE9AJkHDHHbT6xORfix3UJQrlM8Izmih+oRvdQ42XyxBvWcCC3jdOYc9+HW+xGtr9APYvsa8n3cRj0xyHzD8pCb2kfnMVH4kfl1ZmEqrXGqvLHmIpY1Mm1OaUcMqVLFlOR24boWTLHWy+dn249RoTOv0t8mW3wy7KLmeFzm8cjz5wnL/830rU9md1X96CrNZyX2BWwkvAjsKgM2qQ/IveU559Yx2OpExwzI0Yp3p3C5tzUbKAu03tRVrpW/SzatmeaUWBiW1e2TKpjfwX67Xkmtnl8K6g3HEqvSl2jdDTwomdoSynxzpIvD0KNHz6Lyuyg9FoABUSfg1VU3KrkKfGCWAssCeZVwAZ6u9HEBD+vIGdpSkJTNU1/nRdtjw08SQ8h7y6uYSsi6dlDLgFImN6YN4qo+lJeioCcKB3eXfXfjohiuD9DS5UKLX3gXF1m8EJoZNs4xoUXbWekc7/B/lCtlW8YHHO8Jc1fM2B+RujSmbc4vvySuc8MWqsfMS6iFprKW9Pd02PO1GDVOsdojviZfIWkK2lGpa0IwuXKAVrh7C0Dlra0ja/UriPw3xlUE0jj1fUH6DdTjyK7mbtP7Wqc16ORVvN/6EcI69s5s589oKZAGxPivLIZh3t+7Zi5FGGCpHljUYAchZvpd2HOQBdkejR8cEAdZRFwgmMjt8ax0o89/cYYC5Dc2btlHKCxVAGeuhAwAvI7w+8ElNZFXxBC21SkGc= X-MS-TrafficTypeDiagnostic: AM5PR0301MB2515: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jL62YInRY6evlDk8gRvjHNlpjkdvdi8AvM4tQcNMHmfvP5Cpbwokrc78IPBYay8Mc1E+DaOlUpGDcDzh/LjVv/rAlNZUPAEPcKOqZI5ujbWDJcvA8keA3Ws+0ZknnY80hb4AaN2oYgqHDcM80xEbI9uBl3HrwMN+WDlJJAcTsYc3KCWWzPoCYmV4qUwvTgP9W9Ps+1RoiS6BVCAppPC38U/GxqRGNfkXB8NVhUn5kq9gHx2J7zteAIcYQ/9rW8XXANcdBYnZsYCmj5GD8rN7sgY/0AhgSZmdspzl+7dT19OSVWUV44/IzpgUwW02JdGIK44Rt9LfixMb9m9hOumbHskZmdx+x2IE0a+au2sA3dVX5fkRQMHVREpY8MqytekectspdlEdPfvhUYQafnKH+nust5Xjz2Tqpeo9uuRK7IOjERrtBlEpImdeGF01VsNF X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3I9wxFE1ZpsLsiLOrz+JRSN5XBXdCroH4QkSl04uLXH8hYnMRXg92fv5idx++aNAM17F0QQNHrevR7Xc6UnZgPPdOQHzRVVUdREIJlcIBR+v4Iven7XJqzjIrmXH7SmCymEwlv1J8FC4CWmb6aI9Lg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5034360b-0370-4a89-2acd-08d97133e7dd X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Sep 2021 12:43:19.9018 (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: AM5PR0301MB2515 Subject: [FFmpeg-devel] [PATCH 10/11] avformat/rawdec: Make ff_raw_data_read_header() static 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: HowaQrqmBh4u Signed-off-by: Andreas Rheinhardt --- libavformat/rawdec.c | 4 ++-- libavformat/rawdec.h | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/libavformat/rawdec.c b/libavformat/rawdec.c index 06406424c8..b7e5a2d966 100644 --- a/libavformat/rawdec.c +++ b/libavformat/rawdec.c @@ -102,7 +102,7 @@ int ff_raw_subtitle_read_header(AVFormatContext *s) return 0; } -int ff_raw_data_read_header(AVFormatContext *s) +static int raw_data_read_header(AVFormatContext *s) { AVStream *st = avformat_new_stream(s, NULL); if (!st) @@ -148,7 +148,7 @@ const AVClass ff_raw_demuxer_class = { const AVInputFormat ff_data_demuxer = { .name = "data", .long_name = NULL_IF_CONFIG_SMALL("raw data"), - .read_header = ff_raw_data_read_header, + .read_header = raw_data_read_header, .read_packet = ff_raw_read_partial_packet, .raw_codec_id = AV_CODEC_ID_NONE, .flags = AVFMT_NOTIMESTAMPS, diff --git a/libavformat/rawdec.h b/libavformat/rawdec.h index 18777db290..f843fe5a2e 100644 --- a/libavformat/rawdec.h +++ b/libavformat/rawdec.h @@ -49,8 +49,6 @@ int ff_raw_video_read_header(AVFormatContext *s); int ff_raw_subtitle_read_header(AVFormatContext *s); -int ff_raw_data_read_header(AVFormatContext *s); - #define FF_DEF_RAWVIDEO_DEMUXER2(shortname, longname, probe, ext, id, flag)\ const AVInputFormat ff_ ## shortname ## _demuxer = {\ .name = #shortname,\