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 19D3D44311 for ; Fri, 7 Oct 2022 11:41:50 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EE0DB68B9C2; Fri, 7 Oct 2022 14:41:47 +0300 (EEST) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2081.outbound.protection.outlook.com [40.92.90.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A972368B389 for ; Fri, 7 Oct 2022 14:41:41 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QIw0WHiUsQgYDmwu/tTh1OD/u1avdusnuXX2gsblXlrkCgaYIgkDSrza7cLm5EDNL5a1lddCzfWsZTev8A+dVP5c3FsuZK/xIsHXj25L9TNYEqm6VBTiKhOiT2bhUTQPfLH7L0efPrIYrvSZWQNqLwbjjEAKJprIaZ7kfYC4hroMZUOcupCUaIp+HfyRgeSPlf81kNOzWNyXmyf1/K+F5P1NqUQeKV4JLdivVNdqup4VODzRAIf/8yTdvX2dNzISCztrLlgZCo6hqaBY6yBRKE0jN4kqaJrkr0hLvIq/A+6ixH6qYrsrlspeHok6s7TTTxObrH8UcOie34fsUfgOIg== 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=AJNJoEWGRqEs+hgGYXFvYT1hTFKv001qew+jItcj0Y4=; b=KRDIXUvtYz5irrCY5xZ/5iq5hK11vCSEmEg4VZCnhkLWAUW6N3UmCShq1QPOgU4lUcwFV455HYCuMthzmnbOt/pgjAeJYdCjRpXdbbmj0cZxs43ih8vtrWRfB3gD2qAAQHLwS/pNux3+3j6o+vVHeHcTClhQrGaHQuqoUeEept7DNq+DPPEqCfIkPscOpEEkg+w/NtxdETKkGDbc8i1aGk3ZhRdknizBlgnkoWe0NrdHAALn5nWpZ4c3ErPrJWI3UemTyhXFlzV1WBmLgl/ttaN+b8BNI3mtRMPZP/h3LpJ1kw0/erjs9SjRNBQL14rV/LZcihyn0hyli3z9+82WqQ== 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=AJNJoEWGRqEs+hgGYXFvYT1hTFKv001qew+jItcj0Y4=; b=ElUEDmv3IsWKH8/K5/UN70AM/80Xh4RuSHxM8Ltj529v0iZl+uxDpnD6m7XRbU6PzJQbz9xys4QwV38w/UIqqqScPDM6RHAvxtf8dY81piQ8WBl8NDxBogQHzLM5KtdOcAcTSPHWXJFSl4x7eythHUaiXiFh8zf1JYkm/PSvqLZ0Y+shI9wdT8hsuGBhBiotCOyfC0KutAWtO2PFRFRcG7vPLuGvAInxKMGuTpO02OJ3ycDO5ZGqrcPgJhjOC5vGtSt9VKfp7zuFet/9j2ZDs0J+oZ5XLZvcTxMm07EiQyI3wrY0UHLtX0FZLbQdaFVqXFT1tsBPgevxlPpbF6C7MA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU2P250MB0334.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:27b::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5709.15; Fri, 7 Oct 2022 11:41:39 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::68bd:2fc7:ac52:38f8]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::68bd:2fc7:ac52:38f8%9]) with mapi id 15.20.5676.028; Fri, 7 Oct 2022 11:41:39 +0000 Message-ID: Date: Fri, 7 Oct 2022 13:41:47 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [2EB5ehI/gD31VXj/wCIqstveSMx/EYkUFx2BHg4gPV8=] X-ClientProxiedBy: ZR0P278CA0048.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1d::17) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DU2P250MB0334:EE_ X-MS-Office365-Filtering-Correlation-Id: 70949a79-d2ce-419f-ba57-08daa858e5e9 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bVWRwtevnWgs+4GnR0k+W5bmkNVCstwR+7oS/Mo8ojDPG1Z1OUwuGPzWIR9NHoukKnZEyEzgB1g/ZsY3ufy612VZbzqBX1V6D0WR6rRFGoXbKJjHKuOLv3C7/WaHzI/rtsAFSPBNWPrjkzKzqCZSAl+A6HQUzBDfI8WhsxcOaXMI1hTNwxHLB3zgI1poDdu2OEopemaiz3YR75161UducJw4GGKxIju4wjk3ZDJxNtWhggjlg8nvPb5mCCtYPxceihHUaIj/doMsivZXzdPzZ1DEaiRZMargtg2InQVBvCMjT87hS5QhQee4yydgsInPPYzkHMeRlCsYpgeKOtqNiqu6OWgKseCgeWH+7QN0MWeO1YHhtCOYV2wyA+UmVn2lO0p22Q4qWKLd9Py3sud7GqfIAoLXFzgmEjvWDxlWakviuQR5Cf51HrLVAo6dm6onNWZwr28QdAztPRyUBACSbFNpMzSqzdRDv+LAt1/9jfeN4SWV9NTSlJ+zPai1iEvZB9HHXFVTSflCEzZM19/AqJZ86PX5L8ph3JbyUAWRSOHq0zy2CFBvdShYdh2pwf+Lkn21bMQi0T3AMOwcbg1viAVQZApV75mdkTjR8nbtfsnoGyntmazaCrwkcUrU9EUnA++rRpNMV9fOk5ITMiXMpIGbtKRi21nhKlixIXzZCnyepYbd94Mgqche7kIQVvco X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?N29BOWg5V0JkSk8rb0k5RUZhRVE1R1RueXNzVzZLVjVqdUtoUlowbXpHQ0I1?= =?utf-8?B?YVYxLzFXTXgxODh5VVdZWWRQK0RYREtDY3BpNnJLTFA1QVZtRWM2Q0k0UU5l?= =?utf-8?B?N2lhcEpWamEyNDFlV0VNaWU1a3FFSXNVSmR1eWVuSDlXS0Z6dGpPbC9JdTB0?= =?utf-8?B?aHZQMDdDbG9FR2dWODRxQUszU3JMbmhyWU05S1hqL1cwMTNxOWFmMjZEbDFu?= =?utf-8?B?cUcyRVZQOHQ3c1NzN2JjVzdlVWJmd2VnMFpiRmIrVVIreCt0NGtiZVlOYlgw?= =?utf-8?B?KzJCQkVPV1NObjdGQWFTbmxlSGFzb1lTdFdLVzlpb2V3bXpBSllIQ1lqNk5C?= =?utf-8?B?b2ZxSzAwckgwdWpQMzE1SlN1SkVpTllCL2JHUU1ib2xhUzYrS0IzUzVFVklz?= =?utf-8?B?eHA2TzF0SCtYOGRCcys1SEF6Z2h6UWFNVGNZT0llS0tweW5XMStjTFJBc3h3?= =?utf-8?B?eXpqcG10UWVYVU5hem02R2N6M2NDQllRVkVQL1haMmNqd2VPU2Y5SEU2SVN2?= =?utf-8?B?bU1kYXBQblJ0MGsvSTdEeEpGM283S3R4WEdITHdKU2Q0OGxKVzZTdlVIcENn?= =?utf-8?B?eCtMSGE5VU5XMTYvejk5cVpTRWllT3BsYmwvSjBZaDNQSHZ3UndyeUk2amps?= =?utf-8?B?ZmF3dkVWMWZOUlFDQVo2cG1kdDJobVFpMlBqNlB1TVhzKy9kWTM2M3BuZXJL?= =?utf-8?B?TUROM3l0bFI2a3B6RW1PV09mc2J0ZThrYWQvWU5TbE1nYnpzVHA2dnFySmhl?= =?utf-8?B?d1VpQ01NVm53T1pvaHdVYXdMck1BZU5VVncySWt3WVNlS29BUDFQdEhza0hV?= =?utf-8?B?VkRyQzJrVmY5ZXBFN3hCYXRoTXFCaXo1RDNJaU1tSktUUlJ0UEJSTkNSNTM5?= =?utf-8?B?VzZaaG14RGhTb1Z5L2M3VnlPaUp3YzI1emhULzFodURBQzRLR3Nxekx4OGNr?= =?utf-8?B?dmdJamdhRUlpK1dDcUZMODNqRDd1SkFlSEsvTnFYc3RLZkVwQXJjZ1kwMUlK?= =?utf-8?B?azl5bnNJME5WZjhCbGNJMU1ZUVVxOHhNYWJjMHg3RlBhNllpMWo3MnAvR0FI?= =?utf-8?B?RWlqYXJSanJPMVlqQnBOZ2lpZmJJL3pwR1BhSXpBblIwZlZ2R3pRUmJ4S2xD?= =?utf-8?B?L0VuTmIrS3liWkdqaSt4K2R3TURycDlXOWl3WjRhMngxRWttbUtuNGhzRFFs?= =?utf-8?B?cmJPenhucmo0RVdYeVdYVXA2cjVPY0JWU2NWVkVXWS93QmFtUTNabGZQK1F5?= =?utf-8?B?bm1RcDR6LzJMK09YSnFXanF4KzIyVXQ0VHhIbGI0V3NoeG82RWRjRkFuVVRD?= =?utf-8?B?eDBGZGRSMEdRdWwxbG5pUThQcHRPZWtmYXVBQUU1MjB4VUt1bGRpWmFxN2tV?= =?utf-8?B?TXNab2JHVW81MnpCc2Z0eEhXWEZ3NUliVFFVMTdEWlYvWSt0bmdvWXhsUGNP?= =?utf-8?B?blRLYTN1azM2emFSZzJHeXZDZ1pUaFJMblJURGdReGhmRTNRc0F4WHE3UzY5?= =?utf-8?B?RCt4bU44K0VnVGt3Q01zVWhSLzhGUW14SzdNbndWU1VrcGphQ3djMHVESTFz?= =?utf-8?B?Z3ROT21FeDFaMEpKUDRuZG5GckQ1b0t0aVMrMTNocFczVkN0Rm5zTlhUQy9M?= =?utf-8?B?VDJOUUVYdkZQQklyaVZla25ONDUvSWhzNHcwQlFFd3MrMCs4dk41ejVOZ0Nj?= =?utf-8?B?eThRRWdLMXBOTjhtaW1hR1VXUzRHZGdzRWxzQkIxZ2hpSzdTS3pwK0djU3lq?= =?utf-8?Q?NjfjNLmTLE7rUy0z21aS8m5N/bKzv45EoKYXUni?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 70949a79-d2ce-419f-ba57-08daa858e5e9 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2022 11:41:39.6890 (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: DU2P250MB0334 Subject: Re: [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 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: Andreas Rheinhardt: > 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, Will apply these trivialities tonight unless there are objections. - Andreas _______________________________________________ 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".