From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 1F2F744305 for ; Thu, 6 Oct 2022 15:19:46 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EE96068BC19; Thu, 6 Oct 2022 18:19:44 +0300 (EEST) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-oln040092064095.outbound.protection.outlook.com [40.92.64.95]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D710268BC11 for ; Thu, 6 Oct 2022 18:19:37 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZpEK5qa0PzRqDIbfIcqdgHOkVnVR1f+XZL3dV6GoqSFwBPQ+68+8o9hTP0VVsIA4yoIGawgME66eIJvFcu6JYg6xj4zGeF8fWH4+93jrlwRXwMB1f6m2HRcDP6VstutYyILGlLrjjCFv6iHSGaUHApd6zaX4WFSup3RrD5rzQbsar09M0FXSy2YCHheL+UckkoXEvjEobnuEj3JN8oC4+J1CXz1cM2UXW/qAslxQSyq4F6Cefe9G9sAnEQJgn/SsyVfMnlCqlATwo1dFZmJMPoEZkdmpW4NqECo5T0lOTdwjSTPtBBp46aX+FpIkW/nkxyj0rKtLF+atwmlQU/8j6w== 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=BA3F05NgOoWJHD00PWGDX5m70VeuL+wtqMpum6KTxRM=; b=n4Pz5teEsXfGAl2+MtutK/Dj9B9dPusEbPpppzEybIaw0EMRN2bMy9E3VvmMsGg2zWj2KeycL9TL8lwH9UDPMwhvVzblrCQgQMlI0KKSTCT/99CjKs5kPrubwO7isN2kjkR/UQq0AAAZ9Knn74cirT1AhnMsXrKjTdbA/1bekr0Vy0VTXOxUM2GrWO0RSz+dSYHuaDnjC4GKOOl5u+VdGpr00pSBCPhw+Qg1DbO6bcRyU3JRx3h988oInypEqra9Y+2TKgd5ZKCXiWEgyOYFezWfAfFWabdh3x0ExcK/hZXkexBfH6nHRlyh351JZi4Q3jI+uZxb7iyYlHmhYd9OtA== 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=BA3F05NgOoWJHD00PWGDX5m70VeuL+wtqMpum6KTxRM=; b=Q6oW0DDDjMX7zleyXtcLk8/mo4Z5yvU/+Qe0pJzBphoLVjVU6ftuTyz5FaL3VcdSNJ9FbNafx9lTI2ugkc/TwDwicVL2KT/jJOi8A6aeUN0+dAWBFJHAKxlSHdNCct97gIA/6cwvTqoZxzAqC4ZjR6WE+KzF+wlZzrgauINj3cJNKFI2MaekInRFvuo+bXPSunnQtu5144XqoZUmXcBHbZzFZ1nJfMVVI4ENl8YQ/Epp5yyqXQ4B/fIZEsTWvBQg6JmYbN5Rb/evM1FT1E9EgiHPRjY7SISDK0Ao+t/4xxMCJZ5ytaOVWcIvbkWfV7TvVOYVI5LnkAhJ+EPTrdV/ZQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU0P250MB0868.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3eb::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.32; Thu, 6 Oct 2022 15:19:36 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::85ac:1b92:90f:dc18]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::85ac:1b92:90f:dc18%4]) with mapi id 15.20.5676.028; Thu, 6 Oct 2022 15:19:36 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 Oct 2022 17:19:37 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [lX+bzs2DNbsOMFRDF5SS9NHpaAj4dLmtPYWvkxhTznc=] X-ClientProxiedBy: ZR0P278CA0156.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::6) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221006151937.3852102-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU0P250MB0868:EE_ X-MS-Office365-Filtering-Correlation-Id: 39108fda-796d-46ec-4460-08daa7ae2dc2 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmpgTnpDrcwTErdpWWIopYgS/fRvtscB4X/IQ98t4DSjACTcPL/PlD8mZ/Q7mC6gLZycjP1A3vcBg3VcZYySl6jAAafwX9CZkLSRpbZymlfNg5ge6t0u7++iuyOw84Qt3vtnKTGXMPnmuTlAAeDsPKb6qVswXFWYZ2o5Dn/2wH/lq1bMQl2Z3OfsU6YDFNewOtDT7vw/yv5PV+HrzV0pFGkq16AjGVDzN5PJ/hJNxBq9uI9NHdDvwWk7Kmynsj23ip8XRefKDprh1Oz8eZuCg8VMDVcSDI7XwKpWjq3oCgeQQrIRn+ZlwVT6cxTFs4B6m5soWM4HKpTQM7pbjF+LUJlPdzC1sK85c+I3qatFEETRyB/xf5Xd56p8nY7/C3Wh4npK80CesbyuhlC43eafUAGOQ84ZQJ2F6QxVfES++EQj8RpFq7+9WSMAZZIOIsE+zwJNc3uexHQ/I5i6L4IAX/86zTvyfQZvQB0hpGtjeyzAWDpMXjOa1A+CUQk2FCZV4VO+ahR0y1vEuSfJIdgrSHFkjRYziFlODlESAqE+vzhpDQE5BaHbVElKIx6lZ5/3665a+EP1wNjMPNugCVMDaH5fkNaILUv2btahqGz9kz7hQZY55TcrlW0940okCKTagVoTLOc/C+nxo9AMfy8NuLE65YpcwHMMF62Z6sA6d3U1NQK8wJvEjM4UcvDAQqNJebUpGSXB/fWMIG+m1UcLvH5IsIf44H9hmkKs56q2UxcLpt2MIvOqf2N65upmABYcK6w= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cXTqku9tg/Bbe6hW98fsd8r7RFuJAJ4OxrfTCWOkL1btDXPQPunjSY/DTHtuojM0ppuq+651B2+Op2ZwsJRtHHwssCFRYVazxYf+fke2huSxhde2SZbNx9sqyMDcxqOiLqnxZAR/H5mSW5dC8qE0TaeFm3iQMb69XJVV/N8hLIzy89Xo8c5qadYmDQu2PVW681DulgouM4qWmf+1qfY9T4GqDPbaYgPHlL/aNX6g41sAv5SwGYPyDpmk0vyIL72f0Ev0BDDJnAPwji3AlmqTtA2GE3mTmKmgCG8HOJNtW9xvFiSo26KiiQ6xFIFazpYym+NE3lChp2Vd3dF4VW1Qv/c4sTCpr7RHp2tfylkwoBV4cfhTGpeDVcp/TgiTjLQGGf7BE90CHAW1R4q5S0fUqxh+Ddo3MQ5nEZrDblgbek6sZNWhqvoFNIFhddgV68pz5pwChEY2vXlRuJYVktf/WurPouSHB8Kzz2Op0fmxvFmxZjscymSvy9wydwzBF6zyrJ4PYeywf6c1qlADyBWy8v6PjdabG3Bwv86l/2AljlA9hCoz/g6g5wvSPFwRQw8cXWK6XBHgUygl3+C85rCh3XZdddOYf5DbxOq+8gv/YJxDfHbKWw8IuuYc+P5Kf+hgs5yFZWEmsCrVwIaAWR8OYMOMrz6/G1pKDj5h5xsQyexLTEZPhLaw9L164VJBq7vC X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?JzA694I7nGwKjYquQgudycSM5FCXr5QRJeX9Ik6p5W9UB7APINPJ3Bsb9SVH?= =?us-ascii?Q?ym16vZ8KWi3OHfeVaHSbdhUJm7FrE+9NsUQtVUXxAN4LgznXCIfbE5iFE8AF?= =?us-ascii?Q?/Wz0NsyjfzOGE1IxnomBf7Yi6teo4nyUbshm0I30OQp+FRpRso9+LyZhiaRw?= =?us-ascii?Q?cM0YyQOTKixW2YxaJ9u7WF+iCd9wU6/yL67jdPq9aUzVYMhBAedQw05nMh4C?= =?us-ascii?Q?zsJgr6CD6zeIqUPB3GjdWq445K/S+JMtuW2yVArPUIZKtKE52KE1ZrIehjYC?= =?us-ascii?Q?g752YgYlzVZg5QXVhRrgbqnaysDPVv+Da9M4rhSRYucji54Hf1IvCkDJJ7OZ?= =?us-ascii?Q?t3BcgGwiE3TuFJL3oTbYqPPiroVdjKOxHNhTbHsWOXZ2ybKUgZPUsr0s44+L?= =?us-ascii?Q?z7zWdtVLCdJmeSu9AFOcUlBaYV5Hi680MUo2QWH2W969DG2hLR6MqgpuJZ1w?= =?us-ascii?Q?Lle0bCyNHY61C/TMDt9dCFo///aJmepVfT/qsTdtUCtW00OMBUEsTZhvUhHA?= =?us-ascii?Q?JSlLnCemj2Fw51rV7jf/JvavP/Dl18V5PnjgXFF1ceu43/SJzFnTh5MnpjK4?= =?us-ascii?Q?+Lis497EE3rsKKbFnwXcclx/0oGii5AhdFmlAQhbbONVzrCmcb7GShob9d5c?= =?us-ascii?Q?WjvKVS00iTzVx5lnDg4ubZ2hBaV3BZwZNJsmCZbNo88SmsjLgv+zxOUFrhLz?= =?us-ascii?Q?eatYu7WqIbDVatfrY8qiF5pA+oiwtwEnJVEEql7OVUvqmVnaSkvXAhvQipSN?= =?us-ascii?Q?QPhrsmcUDMcS04hOqszA52rXfb9WaxBpl67vnHhU2O0MiBwba8MuUPtaWs6Q?= =?us-ascii?Q?975x1GhGTvvtmoBmvOR6WPDZ5jtR1ld76Qy2rWmHKq10Z1vb4ni1RgWfeELh?= =?us-ascii?Q?ngeqIu6fzCiL052jH4E1ha7TXgF0Xy3diiwL342djx0QPEqKVK2fITtG4Fjw?= =?us-ascii?Q?9VqTOPwTprZIjjn2cn4ndpxUS4Li1DntLVejKTyeqO2RC7wT4GVg5JBrHHRy?= =?us-ascii?Q?92ThkeNRhREiv2y3IpbryRU2UngG+M8kPOhDoECY2Vn7mEC+pvceK8rmYHfK?= =?us-ascii?Q?QeOxSFuBzg1xs7hz9aZyvw5Prjyhm/3QH+bmHXtF++tfOsV51D0ezYXbU+t+?= =?us-ascii?Q?5VnOpt3Lxs5sMZBHCA17kW/D0viXVzQ6HI8w4ghNINtc5Q7xEcb4j0Zx9xFl?= =?us-ascii?Q?RDrmXBQoXtsjMRqLXHAmx1wPjaKyC2x6HM7UxauZynh2wPhgjxXOMNH9eyS5?= =?us-ascii?Q?yz21t1rJ60yQ577i+vg8qMEEqTa20fUzEIyzuZ8KUHEtlTkRA6vjhD9KPM3E?= =?us-ascii?Q?MD9uu0AWmUdNUqkJ4VXPs556?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 39108fda-796d-46ec-4460-08daa7ae2dc2 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Oct 2022 15:19:36.2387 (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: DU0P250MB0868 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/wmv2enc: Inline extradata size 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: This also allows the compiler to optimize the implicit checks performed by the PutBit-API away (Clang does so). Signed-off-by: Andreas Rheinhardt --- libavcodec/wmv2enc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/wmv2enc.c b/libavcodec/wmv2enc.c index 8a6d897468..d2f8afc892 100644 --- a/libavcodec/wmv2enc.c +++ b/libavcodec/wmv2enc.c @@ -29,6 +29,8 @@ #include "wmv2.h" #include "wmv2enc.h" +#define WMV2_EXTRADATA_SIZE 4 + typedef struct WMV2EncContext { MSMPEG4EncContext msmpeg4; WMV2Context common; @@ -49,7 +51,7 @@ static int encode_ext_header(WMV2EncContext *w) PutBitContext pb; int code; - init_put_bits(&pb, s->avctx->extradata, s->avctx->extradata_size); + init_put_bits(&pb, s->avctx->extradata, WMV2_EXTRADATA_SIZE); put_bits(&pb, 5, s->avctx->time_base.den / s->avctx->time_base.num); // yes 29.97 -> 29 put_bits(&pb, 11, FFMIN(s->bit_rate / 1024, 2047)); @@ -80,7 +82,7 @@ static av_cold int wmv2_encode_init(AVCodecContext *avctx) ff_wmv2_common_init(s); - avctx->extradata_size = 4; + avctx->extradata_size = WMV2_EXTRADATA_SIZE; avctx->extradata = av_mallocz(avctx->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE); if (!avctx->extradata) return AVERROR(ENOMEM); -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".