From patchwork Thu Oct 6 15:19:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38585 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4d9:b0:9c:f4b:4e41 with SMTP id 25csp251188pzd; Thu, 6 Oct 2022 08:19:15 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7sxqdYlz2Lp7vmX2/kR82LAzUQdINoJQEw8v+NHIFDCdiDRxrpWDLPos1QMdHP6EkD34tv X-Received: by 2002:a17:906:cc0d:b0:77a:c170:3019 with SMTP id ml13-20020a170906cc0d00b0077ac1703019mr274323ejb.253.1665069555733; Thu, 06 Oct 2022 08:19:15 -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 dd9-20020a1709069b8900b0078a855f3de8si13476772ejc.391.2022.10.06.08.19.14; Thu, 06 Oct 2022 08:19:15 -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=LwSyhPAO; 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 E8D9368B9D7; Thu, 6 Oct 2022 18:19:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2052.outbound.protection.outlook.com [40.92.89.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4527868BB5B for ; Thu, 6 Oct 2022 18:19:04 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bRla2JvvgitWfwOPyjx2vkSoyDaw2HFZc9A7gVNry3hTSExuREgQwGwPk8EeI+JlK5sGYyIEt8gNTKgDxjVrKqpJEGI3S3NUSlAazFOaPMVG922Qf5EvSTpoHN79YGJqY9XZZ/NZejJyvBBJfpAekjxxHAGDJF1/PioCE2iTzrekvF3+VDGJYHP5e7y/DgeZW9HHbsLuAxYigVbDDAU/0QdHJccP6EL3AwaSGAd2oNLIG/EK2E4JXYurHmnQ5YmOXOp1Ym9qscrTIEL8Y1Ugyg56Et09Fog+7Lf0jZ7pdzvOR/mScnVGKVfVvFw2u7dnT7DPcfbzysTefiWusc2kMg== 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=S/6KAeKRZBmRNUZz+HHxllqQkBTuZLfdANMxSuZBVJA=; b=iZl3/6LwiD4x6nEnO8dlmy6ILA7Kq2hcNxPFD7x0UlM+fUgHuv2B/gfuDTvJN287/Xl1j4+wrNMOGV62MdfV7uCL7V3lSGWYpf6c8fonMhnnKdnXVe4G9PGRvoMzQAtkq1aqU6RwnoS9/aJB/VAoDuPwl2TJCfCR1bL9T7UbqW1DzIRhOWtjiNO/KGbdNaGY2jrW2U+DttuItGcaMlT5oHhLhl2zB3uF06zysUyQsiwR6KCOuKEPWOb9c+RcarROZEqslqT5GPcIZ0GBMsF40POdsb7RCOgGUrRr+sRmo2i5nQxHxH/GoIaUeCh7JPpWpPgNr7l9MyYDTgNjtr3cnw== 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=S/6KAeKRZBmRNUZz+HHxllqQkBTuZLfdANMxSuZBVJA=; b=LwSyhPAOrk3MN7LrWjaxtwrt3au4VDS+uIR3zKh5eP/l2NckOBaGk80Hk1KHTNXks/a6SEy/jrqmfnYvTXIr1LfcLkyDkoFnZyEioIeZ2kbzlgxACRqZnhpL5zfyoZfEC/FzZGjI56YT+fhMsbHDn3PzFvYwRm4fcapH5EIGNOe3MeZ6W8GP9BxsMhr+p5qvAue2c/qSaV11c0seTmEGdC8e6jG9mWynnhKY96hFsm30L3qETqTCIny8JwjoRcogLh5TWLdwdau9xXTn6ew/GDGsJogRGuYf53Qq8eNPQm0yi8W36aMglwlVDvyYeyowC4Kd8KYR5kwkwkf2iqsYkA== 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:01 +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:01 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 Oct 2022 17:19:01 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [5q5M+EITUEUqPI+F0155ea5uBRdsC/Zg1CzmuU82BkQ=] X-ClientProxiedBy: ZR2P278CA0023.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:46::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221006151902.3852034-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: c094dc8a-e6b5-4c71-676d-08daa7ae18e9 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmpgTnpDrcwTErdpWWIopYgSxEIkD4pU5SQy236q4z9FCljA7u7dVPp+J+CnjEn26obVwZx8lBWIfOIeyIUuDYHul9U6dNuG+F+mt3mHTxBXooxdP3tJqXqy0ExEN2ULSBJhMZnweW2wpzPhPDs7DVKW5EyD3Ndx6Y9cx/uijc9B4k2GikE/sDAvpeMOf9QpMzkY7gJKK0DDoCrXjmkY19oHlKY7RS9olRWFpdRM+jNJNJ3CjGHhwgZbHy3EQLUfgtr74SZtFDtil+ov8Cj18BfOBDfn3oqY3pocNddN55dTqrAECRo8xf8W6aWwg+g/GgAewsHnVBXJg+RO7WGggcedSVRooyt5qGBKLFWI6HqIten0ZZFDgi+D3e6uz03t7T3JhH5+iEvJoOgM/y/OHEgxlXVg8tRQ18oGlmKE3jbqN26RKVwl3wI30+MlT6T0nvqpqy4gtF4htNKfuNfbysXKwh1AtoRh3fTsUSeu8kVR6XG95a05ITeEJZqHfLxTkl8+63eIlbM+RlZxIovoJAVGHrWK+IcNaTm5qM/MuKkS00Gsb7GtqYilh7EF0M1VwTxGx8nOADQlbnF3uRPjFr788ICwsdKBDHOmb+7KOanFV2aCmMj2Eu6wW6Vuw4I2sN9hgJDSpwnh6t1pVgBykdW2Sz66N/B709SlXrFv19mjalVqYLxlpTXl8bMYWgZEZl8B63WwSb0GmnUXM/OKacDsmx9MeOTLj2Q2LqMQaxSiB4IwO5ZyVFrnp4tV670rb9g= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zW3w3C4BQwjlS8i+9BzIFyhxqHcwi3QOghbf5mBHVPS0f8qYBcbRcfUMWxRpwfaDrRziaKXLEFPKRrpHHRwVgOZck5cefPUgnQVqegrkBmzxZvpERrMfKzXLi3lKJGM+AuRyuyBoFaOz3+PVSSycRH97YNxVur9ji9cpKAquFInNCxP5HaI9c0LZ6bwKrO174fxPSUCiJvEh5ZvkZWvsKTFFsQeauOiEgp5OZnFo+phKbgHiSxDZW56Q9jUj5+DYq6nms80TA99PJkrI2mJ3Un7JnIcsdHsepyE0OVeVqQiHcB2IKW1mLt6fEt5TI2XcuJQikwtl2FtufduMkxZjuP4rdTBN6EVtQCEg7cSVZHY2MZMQECDZPK3wwgqOvgJx3aYufZ7/em8IWmgRCyHSup3aASjSq3sjssazzPzjqdW5TJXTqN6Sk2Xlp9MIwR4U+6q1/KOKtgxbCtEw7YdDFHP9BFrgcb8HoSQnaiPRLI0pUz/STZXXdQ42Ts/OhDI/H9RLTpm7GS/jW/6d36sNQavkGKne5UVobqrwcHDGszGQn9wi1K9Ff3LPmxx/HHQWqz6msltlW6M7t7xT+DNVdjE0nUX2/VhOWBCCOWCwCBpcx4dAIreel3H8dFd5FuGT9IeY0e7dol9hAiDGAlP3ikQ6aDz6ZciPIHsd0isjDYJawgoXMOisTxVnrRTDBtJY X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: miH4mPGQZXWkGzfMz0QFw0XMT5RCM4GFxF1YNW957ST504oWV9MNueDrzhM438QtqrFfEblOA0ZT5WvrTuEapHKkm4nhAJLtzq9ufdXTbKZqkVrXj9MIwLmJt3wPXARMfk1As53/AQxn6jT/V0gdq61OYYIWcBBgzS3V5Yh2GBgF9PPLfpTlKNHCpGdx2AS3OtUL1GnA9iH+ntRlQfmXB2J83wyetkoQk3VukVBcXKknQ1RCB6Bw0PGbO5WasN9FUPoUMTludzRLVU68Fw9zl/XPNWzHycdEybv6JIRcT4yarAWl3jVCaEACoNO1hjUZx3NWfGsWnO8Yz+kbtxb96cTfqkasYkUtEFOcYAwf6Re3GIA3l8tqji5oGlUf3xx1UYN/HIEcl5Xygzg1dblbzZx2Tpd+quaWiMo9ood6gxIHKvLz6R60WJtEiBX4V01Be7jG9OpzcdpB8uTgGJ9SoYjSgQIeeS1r00sz7AxjfWKOThw1wC0oH6a6tGD6kY1Km9dq13Gy7L4sLGU0pjzpjZdzYBz3DFtm8CEeaRTsqwl23ygAz0BFJc2Wt4FhodckTza7PX8mlzc6O8FLKnOPZzAjr0y9TGa8TyPawYlbY1hD2cQBxlvb+Uv8AkuF1Ukp2sZ2hGWMfJ6tLlwdQi0GQ1Me9ltN3FdiFhkKCHMgLMDVhxMqqw7tvAGmUSW9j2ZBT7EophnGm7mZrlk5rA+hIAA6HtA+ICw5mk9RFKedS7ccVGT9x+JuEqzaN5A8WHUqGI2htUDmmpSyk3PlOwRTIctcnsH+M4MqJxRd7aCrHXaW3WxkZSjzq4eBnxpbrv6jBRmMTiwWMEwpW62VTYSH/C04Tv5QtjiVc1UHWlHo3IsNAKY56DwfEp25ui07RG4MquxEXaNXs8peOi0D1a3WYZl/1XXCSppn9yzDIC68064RjDEyumiHs8lhM3in0ylH8lrYZlnotw2Mx+HbHdypg8kuRBtKEZIhKHBEdEub6QN36WkJbKqiD5riq7EShMWOgfZrDW1WkY8UYmw8RbXPg7c3wePe2XwA9LpePFAPZ2GH9OZkmt7amjm5TSGiGQvPKMRu/O24jCyEDwVsIwWPt8GNVuf6e8ESrqBC6ZHTy76J2NeBHfwNcyhfxN2jTHUAZLkfoPllTp5ro5gCL7LQ8EY0dU8+h0TpsCQZwuolKKglg05zwdjENIPUsnrdXMmI5KcP7D897UMJhh7ZXNN8mFb0xBhndjBA7pB7Lq5i8R+wKxKrcNdHC45SJ/Z3W4ciecGWC+aaUMH5lNs4xYkuSVyIZH972Ek7rHH0uAAAbUOgnkoEKUdd23AxcLExDwHt X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c094dc8a-e6b5-4c71-676d-08daa7ae18e9 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:01.4049 (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 1/2] avcodec/msmpeg4enc: Fix indentation 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: 2gN7IVTyHilp Forgotten after 2b9ab1d54a35f7d689b2396cfc59f9dbdcae391f. Signed-off-by: Andreas Rheinhardt --- libavcodec/msmpeg4enc.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libavcodec/msmpeg4enc.c b/libavcodec/msmpeg4enc.c index e40acdf3fc..f0d0045e69 100644 --- a/libavcodec/msmpeg4enc.c +++ b/libavcodec/msmpeg4enc.c @@ -279,15 +279,15 @@ void ff_msmpeg4_encode_picture_header(MpegEncContext * s, int picture_number) void ff_msmpeg4_encode_ext_header(MpegEncContext * s) { - unsigned fps = s->avctx->time_base.den / s->avctx->time_base.num / FFMAX(s->avctx->ticks_per_frame, 1); - put_bits(&s->pb, 5, FFMIN(fps, 31)); //yes 29.97 -> 29 + unsigned fps = s->avctx->time_base.den / s->avctx->time_base.num / FFMAX(s->avctx->ticks_per_frame, 1); + put_bits(&s->pb, 5, FFMIN(fps, 31)); //yes 29.97 -> 29 - put_bits(&s->pb, 11, FFMIN(s->bit_rate/1024, 2047)); + put_bits(&s->pb, 11, FFMIN(s->bit_rate / 1024, 2047)); - if(s->msmpeg4_version>=3) - put_bits(&s->pb, 1, s->flipflop_rounding); - else - av_assert0(s->flipflop_rounding==0); + if (s->msmpeg4_version >= 3) + put_bits(&s->pb, 1, s->flipflop_rounding); + else + av_assert0(!s->flipflop_rounding); } void ff_msmpeg4_encode_motion(MpegEncContext * s, From patchwork Thu Oct 6 15:19:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38586 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4d9:b0:9c:f4b:4e41 with SMTP id 25csp251455pzd; Thu, 6 Oct 2022 08:19:55 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5Ky6uhItCc62a3t9c6wIrxR36LHcwlebgPfcnCfxbiUd0lHmG7JE4ZJc8hous6AuRlu8Zq X-Received: by 2002:a05:6402:d05:b0:435:b2a6:94eb with SMTP id eb5-20020a0564020d0500b00435b2a694ebmr256973edb.87.1665069595414; Thu, 06 Oct 2022 08:19:55 -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 d8-20020a056402400800b004596db363c4si6611934eda.264.2022.10.06.08.19.47; Thu, 06 Oct 2022 08:19:55 -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=Q6oW0DDD; 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 3311768BC02; Thu, 6 Oct 2022 18:19:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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: JzA694I7nGwKjYquQgudycSM5FCXr5QRJeX9Ik6p5W9UB7APINPJ3Bsb9SVHym16vZ8KWi3OHfeVaHSbdhUJm7FrE+9NsUQtVUXxAN4LgznXCIfbE5iFE8AF/Wz0NsyjfzOGE1IxnomBf7Yi6teo4nyUbshm0I30OQp+FRpRso9+LyZhiaRwcM0YyQOTKixW2YxaJ9u7WF+iCd9wU6/yL67jdPq9aUzVYMhBAedQw05nMh4CzsJgr6CD6zeIqUPB3GjdWq445K/S+JMtuW2yVArPUIZKtKE52KE1ZrIehjYCg752YgYlzVZg5QXVhRrgbqnaysDPVv+Da9M4rhSRYucji54Hf1IvCkDJJ7OZt3BcgGwiE3TuFJL3oTbYqPPiroVdjKOxHNhTbHsWOXZ2ybKUgZPUsr0s44+Lz7zWdtVLCdJmeSu9AFOcUlBaYV5Hi680MUo2QWH2W969DG2hLR6MqgpuJZ1wLle0bCyNHY61C/TMDt9dCFo///aJmepVfT/qsTdtUCtW00OMBUEsTZhvUhHAJSlLnCemj2Fw51rV7jf/JvavP/Dl18V5PnjgXFF1ceu43/SJzFnTh5MnpjK4+Lis497EE3rsKKbFnwXcclx/0oGii5AhdFmlAQhbbONVzrCmcb7GShob9d5cWjvKVS00iTzVx5lnDg4ubZ2hBaV3BZwZNJsmCZbNo88SmsjLgv+zxOUFrhLzeatYu7WqIbDVatfrY8qiF5pA+oiwtwEnJVEEql7OVUvqmVnaSkvXAhvQipSNQPhrsmcUDMcS04hOqszA52rXfb9WaxBpl67vnHhU2O0MiBwba8MuUPtaWs6Q975x1GhGTvvtmoBmvOR6WPDZ5jtR1ld76Qy2rWmHKq10Z1vb4ni1RgWfeELhngeqIu6fzCiL052jH4E1ha7TXgF0Xy3diiwL342djx0QPEqKVK2fITtG4Fjw9VqTOPwTprZIjjn2cn4ndpxUS4Li1DntLVejKTyeqO2RC7wT4GVg5JBrHHRy92ThkeNRhREiv2y3IpbryRU2UngG+M8kPOhDoECY2Vn7mEC+pvceK8rmYHfKQeOxSFuBzg1xs7hz9aZyvw5Prjyhm/3QH+bmHXtF++tfOsV51D0ezYXbU+t+5VnOpt3Lxs5sMZBHCA17kW/D0viXVzQ6HI8w4ghNINtc5Q7xEcb4j0Zx9xFlRDrmXBQoXtsjMRqLXHAmx1wPjaKyC2x6HM7UxauZynh2wPhgjxXOMNH9eyS5yz21t1rJ60yQ577i+vg8qMEEqTa20fUzEIyzuZ8KUHEtlTkRA6vjhD9KPM3EMD9uu0AWmUdNUqkJ4VXPs556 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: QDiRf1cz2SK1 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);