From patchwork Tue Jan 25 17:41:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33845 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp832531iov; Tue, 25 Jan 2022 09:42:50 -0800 (PST) X-Google-Smtp-Source: ABdhPJx+dKgaNPP/0hwlI5AduA0zcp89sB3Na/qC4WXsRqKdHS0Q2LVvcMea16y7nRtl+iqsxxLv X-Received: by 2002:a17:907:7b8b:: with SMTP id ne11mr16693690ejc.436.1643132570233; Tue, 25 Jan 2022 09:42:50 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i10si10967884ejd.885.2022.01.25.09.42.49; Tue, 25 Jan 2022 09:42:50 -0800 (PST) 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=MmlMLdDg; 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 CA69B68B0AC; Tue, 25 Jan 2022 19:42:21 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068072.outbound.protection.outlook.com [40.92.68.72]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A877C68B082 for ; Tue, 25 Jan 2022 19:42:14 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kRjB2JrrwCmEaS1W/EzYMi0JdlHfMfemdZtqNVSOCV8w4R0EnBc5Xt9G7glQj/SGjUb/Mysr4QvffekYLYw+SuIj8Rbf1yUuW0N0IbhPkf1Zr0OhKF/hgvcqLAivtiHuKuvH07hY7DDg0c7AiKs1wGsDk3uIpaqHo2qucjqCUd65Gbvf64qWtATPBFIYvRTNwDHAA0j4NrC0sgnY33BtH0HBowEINDCuBhtuKXo0Rq9nFtZUD+wUDZOMyY4VjM3tHeZzsxEzBmK2ghuJ/Vk5sEggr3JQu139C9UZy3JRs1aHWAombVVl5vZ36tBz12zySe4cQRnIjVS2aopJnS2qiw== 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=eNDesEK/HT1IeHIRAbQlNb4BjokFs+aQJyluXo5WhZ4=; b=OaI98aa0fiUaQJMPWZMnVotuSM7sJ/tfqcG/rJz/b2mDvjWoNAHMQtHhpEnktJfp//iXxAso6G3Y1cUr9+ZTjRfIHhkYYzhgE9Zxnur4fZklC0GcUNBsYdFI5pq09SPafkFq1Rb8ifO3AW0ucis8yHTKR66RzsOjWuLXH+IPGEXij+SOoi7SEAFAmWimAUprFNee+46OXLWQPLwWbeWewJHRaBP0Tn6Prg+6emkR+LgZGhWgln+3gZBUtfrbulQm9wf/cRbVIsptO6znoaw0XbdduCPkBpWas/zptK2SuEfjqzQjNofqeaFui9pZAG6V49+jLF17kPGCAUARg9aB4w== 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=eNDesEK/HT1IeHIRAbQlNb4BjokFs+aQJyluXo5WhZ4=; b=MmlMLdDgW59ctcHvwWxSxuIAa9D6BA7fjCO1XkSjvbfl4+f1z5awREOrtTYYvRvr9AdmN9h4n/3XbhulcIALn7NQd7cPNRpz4owLaGVda9hYuScSzI3A2lKjbroRCUcg/BaDgnGh9cNt3ykeNz7gpUdUGiewEH7D4E1jvX1ckHPNZJ5j5Fwn7m7eH9rIgrM49bepiclHc+p9pfWkkWVRAalm9w1oStyIbHE4EW73t7iJEOV7Zh3C9kChhKjh4RBWqFaIgvekvYTG3XHrDve9UgBasLME8Qxpz2I9bS6JXNyd/hOyTG1Nb2zFcQ4QWu65eGb7WHtX5akt35nWYxq5DA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by DB7PR03MB3500.eurprd03.prod.outlook.com (2603:10a6:5:8::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4909.12; Tue, 25 Jan 2022 17:42:06 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%4]) with mapi id 15.20.4930.015; Tue, 25 Jan 2022 17:42:06 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 25 Jan 2022 18:41:33 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220125174148.994967-1-andreas.rheinhardt@outlook.com> References: <20220125174148.994967-1-andreas.rheinhardt@outlook.com> X-TMN: [dJACnmAfbgpJjbptGjQBNsZl+4ayJyDs] X-ClientProxiedBy: AM6P193CA0061.EURP193.PROD.OUTLOOK.COM (2603:10a6:209:8e::38) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220125174148.994967-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 63b22e24-7784-4a1a-88c2-08d9e02a0148 X-MS-TrafficTypeDiagnostic: DB7PR03MB3500:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cv+WWl8usRQvRpZZudEZ/0Y3bxWVqQDu2G8V1oUIyJ9SyQRhUgnG3U5J7QjJkwPppqfQm90q4XNmr9LuoQ7KYgTqT7hwid5Nfh86NZC0FfoJa84cRS9+II5RWYC+huEE+B+L8aRClj0knq0Mql7ehHa9UdTERmEpmFxb6m1TFeHe1lBo3W/4JbAuw3f0A8+vom+61uasGZSP5yrerPoQDSUcFhw4mWCO/b8oPOgO06cDcXzYhDvZHS1ElWxoyxWh6Y4Ul1KXq5IlqkPeJ2gbKGd0+QLSRcZR77kqMYw57b8S78sgQwUaFg16M27tQ0M+JmVKZrd772LdN9lteX++O/K4j5GUfwY7N3Z3DBOfWe6828Dn7z8ldvV5OmvR01KW6LfmlJuFQjhoX4+PSyhZOXu74dklko9PhH3YNfOXGwjpljgK2+SLoeBKrVo+mBpAJtjcZtiVRK07NUEltzuXy3myfwMFip19t59UIRqLjhKsc5cZT3bKM0ZaUU8sR7057tAUYeL/edZeqksHS76yAOC0Ml8rSwkLHc8L74farXcXcXLG2VWxmr63WFh9P4rA X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: gcFA1UVLCXk9Vi/mEiUgrvinLvKXsvG+4iXVhWle8yRJwEGib9VGFZV0zw/a/0bYMdCGr8eB9Z9faXQfIpfhaOEQVLOqU4fDVlyZC+B7CtaN+r3pHQ6DHxdGAqvlqxvGAuPDfS5Y9bkYFplRuFrVu0xT2wSWGOz0g0vIOD/d8UEuxg4STtCU9QhIfHrkOfeJO3/t9GaBxUP982vM2+RV3QDB49hHwY5HtE7V2gw3wVHfpEe6a0qamOyC9nAV5umozgyFsCy+OEfo1ZA/Vs5aiQOtag4nsbLW2pczogowU1xKPcf35wG9120HYCqmZ2HCCx1uinMsb9FejNY1sQ3NW3wyFrTMKI4lVgBkKV5144Z2pHg48WxJQLjdpokVXqzRxUpq8ZGDvv+73ez3oJTz5So0biOI5ITQtAxJbS5lhGuLqYeVseUAwtmLo0meSlxUFxpwBJUbH7fOUSeWzi2ixMNDlWWJnEVAvYnKF7Tz/AYYK3+4PIgLmo3ARzurWT0Hq5OFp1jaxe6cFL6b2qPxGlYdIlIMy1OsDIjMaA0M5gooCsWfXcp+RsoJ3pmvpvZ2XNW3QisZUsrsXuTKoUGu/6IUGj6NBHhFrNBgi2ZPs6x6CpMbtvsYRb+XIj6ppyqwmJkSH8T9cMr06gpBrz+eQFguDRzS6B/WjfKdqJ2CT41BEXgb7Out18vK0Gs6kPhIFPUaqfsEyluoQfyocvCOReNFgVbtSw3EfCNOc3DUtq+751X98zDfcFBPlJ+e9kaMABkVQbAiJRN2X2zICbvC+jI9vSYrQR1xegjeTuaXu/7b19t8JpMFic6hRfpjX/eZTEw3MEBWB7KeCcQpf1irMLVKYGxeSk+m+Fbsgohke3Tg2xtciPamzNcnHSYSl+AWfBmuHGmVyeWgYJMIT/20phXrWoV8jrizNrS7c9VCJ5NC7yOjN7TrKGKyiO3RrcIUYyQTtVKoykR+47TwSL3cbQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 63b22e24-7784-4a1a-88c2-08d9e02a0148 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jan 2022 17:42:06.5664 (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: DB7PR03MB3500 Subject: [FFmpeg-devel] [PATCH 06/21] avcodec/ituh263enc: Use stack variable for custom_pcf 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: 44jQ4h5IevlB Signed-off-by: Andreas Rheinhardt --- libavcodec/ituh263enc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavcodec/ituh263enc.c b/libavcodec/ituh263enc.c index 5a7791111e..069c6a9acf 100644 --- a/libavcodec/ituh263enc.c +++ b/libavcodec/ituh263enc.c @@ -106,6 +106,7 @@ void ff_h263_encode_picture_header(MpegEncContext * s, int picture_number) int best_clock_code=1; int best_divisor=60; int best_error= INT_MAX; + int custom_pcf; if(s->h263_plus){ for(i=0; i<2; i++){ @@ -120,7 +121,7 @@ void ff_h263_encode_picture_header(MpegEncContext * s, int picture_number) } } } - s->custom_pcf= best_clock_code!=1 || best_divisor!=60; + custom_pcf = best_clock_code != 1 || best_divisor != 60; coded_frame_rate= 1800000; coded_frame_rate_base= (1000+best_clock_code)*best_divisor; @@ -165,7 +166,7 @@ void ff_h263_encode_picture_header(MpegEncContext * s, int picture_number) else put_bits(&s->pb, 3, format); - put_bits(&s->pb,1, s->custom_pcf); + put_bits(&s->pb,1, custom_pcf); put_bits(&s->pb,1, s->umvplus); /* Unrestricted Motion Vector */ put_bits(&s->pb,1,0); /* SAC: off */ put_bits(&s->pb,1,s->obmc); /* Advanced Prediction Mode */ @@ -203,7 +204,7 @@ void ff_h263_encode_picture_header(MpegEncContext * s, int picture_number) put_bits(&s->pb, 8, s->avctx->sample_aspect_ratio.den); } } - if(s->custom_pcf){ + if (custom_pcf) { if(ufep){ put_bits(&s->pb, 1, best_clock_code); put_bits(&s->pb, 7, best_divisor);