From patchwork Mon Sep 6 02:27:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30016 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3373322iov; Sun, 5 Sep 2021 19:28:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxsgfohqGKuXtQK+ssyK2TLCFaifvoIviz/rbv7ethA3Nv1YHo7hUxhQH1vAFWuWCrv1GVs X-Received: by 2002:a17:906:7847:: with SMTP id p7mr11191182ejm.335.1630895329225; Sun, 05 Sep 2021 19:28:49 -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 n1si6877181ejz.195.2021.09.05.19.28.48; Sun, 05 Sep 2021 19:28:49 -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=RS4iJFT1; 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 AA38968A6D6; Mon, 6 Sep 2021 05:28:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-oln040092066075.outbound.protection.outlook.com [40.92.66.75]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3B57468A6D6 for ; Mon, 6 Sep 2021 05:28:26 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aTsVtT6RVizc/I6YcFzrrsHIH/8LR2RSq/KMvki1ItoyUBpBeEqfgRijGtkDRkeVn7pq5qCvsbJvrcrMi8E7+bWU51j/qkVlZez2yyN8PRv8AZr+hsLQQ4qfF7GuM9MjuK94tcGXpBa5L/GME05uMazA7rz3ah51RdlqMoMTxbxcWK0g6hstSoXxH0Nxu9okccwTQVEKgy3yIYhcT/CM1FBy9j0C6YkYLg/7AdO96d1IyYDUXUvIH/tQgTxb+rgni9llYQ3TYC1HsR9dfGrJ2XEqc69SwUeH3uJs1oWYmVO752A8HJNWflyLyQMQhdJoF5l/fbw/PnGVU7q5buO3IQ== 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=Ab8eK9MD4QFxVQePQmmwBMa2x52Ibmm9gmCFUwu7Ysw=; b=UDWwlwUYX5Vl+dAgqj82xkxu0MNptGssgQ2xI8YMpuRIVEba9v3cMQloMx+BdcAKjRN/GFd9clkQyDQ/GNW8doEHfKu0ApYxHyIxuhUXcj+ILTAeyOKigx3jBEwwl+nG5XqjyhRXQL8kNWLuWRevREoyReSr7RPjcOcHlBF/yByBo551s+opxM5YLDW2efk2uj1C43/xQAuKnjuyQAeTr/hRbu/Ab3mauyj8z5XCllSrb6IYYHfVEb8RVf5zim653NEiMQ+eOfyDsNeJszFqfL8Oh++qiyLHyI0o/VZbmpZotYhVMBbHIjAkDyWB2jfHZUXsEK4Ugl09V20ZvW/BJw== 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=Ab8eK9MD4QFxVQePQmmwBMa2x52Ibmm9gmCFUwu7Ysw=; b=RS4iJFT1wv7GVD/J49C52jj/E2wVDl4P4RO8IzcVkawaF49E75C3IEqqq4pvimi96GsYqLTIt0GKyCGWLq75ov9TnPu2udSqU3S/Cw7Kd+Lw+5Qw50AenWffEiP/K/82y8WaBWnPK1v6xsQ9hxlRPYprFLxv+849TkEWPAZ9UwZyalawEpQetQ92SZjS7wGr4TgtpyPfwmlZw52/V2mmudNqVupwL0eF2NusAFg6GLv+uW06j/U4422HYEo6MHwt+HxF091tAqh2Ql9qAbR/KlwD6waHBMWycT5kj0V0VdRm6qzn8n1VqdogqKbVaafjVLyLgaosRu4iJQwRP5QHeA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM5PR03MB2850.eurprd03.prod.outlook.com (2603:10a6:206:20::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.24; Mon, 6 Sep 2021 02:28:18 +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 02:28:18 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Sep 2021 04:27:42 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [FLXTnJtDasCjZrLfd9NxUgBBGAe5sPuD] X-ClientProxiedBy: PR1PR01CA0033.eurprd01.prod.exchangelabs.com (2603:10a6:102::46) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210906022802.4072793-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR1PR01CA0033.eurprd01.prod.exchangelabs.com (2603:10a6:102::46) 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 02:28:18 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9e3767d6-022f-449c-ee2a-08d970ddfcf7 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUZQ6GYRQPJKZ+OQ9+mOW9KzjWcKqAzsuJqjaY5fKKiX450GeL35I9XY3h3tXqDQ0zdPx1D1fSznI39KiyDwWxUyBm+K6JE/L4J3RxviarkKrvDJ4FtUmpxwf3Rl6BJGfdfRaNYlLxoe3WhyQUIoHXwIQdJDvVF8X0ccQHHaUkqdNuU22Rnh4goUyg0/px55XvnRyxnLHcGvhLK61ZwzJWueAuEiFCrGCtX7nSDawh8AdRsXOxD0eQ1/4i4sxvuCxogOj9z8Qm+53HMHc99M4or0xIYwGAeRg3FaC9b6LrB7YAOpRz7ZYuj3cQrw/87vh7yPF9fb5NouKTrffNN8IvUFMDtg4XKBPAtpOOq0Fvf/pNdEhqYxmJlEelO4kY/NoLIpWkypL98Bm6l/a1FbTCyDnunbEgJft0A81hmMXNL7KlTLeqbNT94uNh0KGdqc6zWKt8v5GHH7M769Egh60v4hNurCPPQCkhqZSdaESSuErCxk+ODi73vzFjj7RFrA/cHHl+1jsiX08okns2CJoZdXsK3qHBMzXIq9PueLJ1YyLJK5w9Z89zeF0E1oraFvhJvTSdErZJf27fJYThvvud3HbL9Cb8PlveaJo3rElA5Sux6SKfpayDEQI9IF5cN73295ItRkMAQiEIpfz82YfOAT3D8S8nQVbugLxrttXZfJHVeU8bUhj5RWDqjNlVXIUx2TNvb/B3XOZXGgGDOpr3gI9Xup2psD5E= X-MS-TrafficTypeDiagnostic: AM5PR03MB2850: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WRq8mellyUo84QNoTKG83wnQPYUFs1SssLdJGm9/vh5sR2Q89elhYavi5lHFprUkb5Fmmr4cmkdF60RgAOfYaccfcq82FNwQMHlK3iceF/L5bK032uLVB5Ka3kCMoOPGcJLVwwuoGZykHFJ+C5rFHaKbJIOvBqkXM4ix27ptjzq8RgLfdKdIZeR6rzpcVlAhNA+++noaHpI0OJ+nCX4qhNufjuXcoGm2MVXZh8j06LkaTvan6LoFzMp31LvFPEbPIB7x0BIzwM549tT0sNCRsL2MJyLaFykXUzpBq+on5zse8KF4lYsVx1ooSIwhWgUgRaozetrvEiJBCs8viAuUjYTbKPR4+iJRKn5Ob3gI3fNVoW5SkfaZpt1niMEnHOhWUjk4wcPaXYYEJm4CAXmDjErnQN1LPIPMnY5Ehd2P0YL5AWAXrkBbAauZFwCI0YZm X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TYOQD3AaPwx/9BQt8WSXMVAToqk0wNJeerjM0YlPEaoSvBibvGR4wjlo/TIAJSWI0i1KM9zot+dikbeZRKLF7vp1lhekg8Kk4o+NKEAOBiGS9uby8vNL4UirGu8pAci5heZdZScnVaf9/OoQv7hGww== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9e3767d6-022f-449c-ee2a-08d970ddfcf7 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Sep 2021 02:28:18.5936 (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: AM5PR03MB2850 Subject: [FFmpeg-devel] [PATCH 14/34] avformat/asfenc: Remove unused fields from ASFStream 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: TTgtFTj0ViiK It has never been done in b08569a23948db107e5e6175cd4c695427d5339d, 30b8f3e7dcd0318b91e205dcbf774ef92fb6193c. After this change, this muxer does no longer use sizeof(AVPacket). Signed-off-by: Andreas Rheinhardt --- libavformat/asfenc.c | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/libavformat/asfenc.c b/libavformat/asfenc.c index b294431aec..1706062f7b 100644 --- a/libavformat/asfenc.c +++ b/libavformat/asfenc.c @@ -186,36 +186,11 @@ #define PACKET_SIZE_MAX 65536 #define PACKET_SIZE_MIN 100 -typedef struct ASFPayload { - uint8_t type; - uint16_t size; -} ASFPayload; - typedef struct ASFStream { int num; unsigned char seq; - /* use for reading */ - AVPacket pkt; - int frag_offset; - int packet_obj_size; - int timestamp; - int64_t duration; - int skip_to_key; - int pkt_clean; - - int ds_span; /* descrambling */ - int ds_packet_size; - int ds_chunk_size; - - int64_t packet_pos; uint16_t stream_language_index; - - int palette_changed; - uint32_t palette[256]; - - int payload_ext_ct; - ASFPayload payload[8]; } ASFStream; typedef struct ASFContext {