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 2312D4B73F for ; Wed, 12 Jun 2024 13:56:40 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 449A568DA98; Wed, 12 Jun 2024 16:56:10 +0300 (EEST) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2094.outbound.protection.outlook.com [40.92.73.94]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8445B68DA32 for ; Wed, 12 Jun 2024 16:56:03 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VdZsddQiyTffkrIVrQ0qcSUN9AAPd91qaVveoghlrYPX/CQrmpBRgJ4rS0PNQPRTFBC/Ehpu+Wbh7T1P7lF3BXFva22tG3ZFJbwjdNel8TKeuWAvusJq5wXRPto06o2LOIY46zz/Ik2kTZHVuXB7ufDg8CV8bke8bE+tiqtUS9OQkjWBhv3b8iX/N2y0Yafjbj8nMDSQ9MXavMIPoFOKzTfjUlPfKP8W9kjP9g6igO/5NbGGk7lrQN9PKYYg7AA2uZPwaCOnRUe5lkVAKe7gzyb0pNsBCtVvv5U8T4fVpt5/THZmU+6e7OSeWgVWdxcYjKoK8iNBbnY4tDoerFRLGg== 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=jPF7DJ/xGrhnleR2+sovSTQA2IKVrIw/qOxVssl9JH4=; b=Sewvk1oazJ8pOEGt7682s4hbbB0OW/KJxDLu/BHNHSlDvZ57R3tIHOKpAKhdtWRFcOnDBKjby9z1c6tTHyPHOZm24E60BcJsG3xCrJVeuZh88TIcXhsX/eT7QuXODcNNsyb7uArgRbbI0Tu0ndqtjG1iISTnRwqSXrlftOSiHX3Vlev8FcjG3rRl/HhxO1e6Tmbj9r29TlSLTjZgQfgFSAYHVK5aPJsMlVliFB/iJZWTTemt5ymdndjBZ19axMl2gAc6HlCU8Fvs/lcgPOTZqqa64ZUmxWmrAX7QVzoZepGtUvmtUdh7SMglBD+COaXIoEigo3oB/RrPOLaDS0IvWg== 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=jPF7DJ/xGrhnleR2+sovSTQA2IKVrIw/qOxVssl9JH4=; b=tKMxZxLmonRuyC2j2EOGJyqpzkGR7UQr31RocjJKGlBTSzP7gULb9joMW9CZJ6IPs8aQ7pdWzLN8mVVpmTjkl68WkGF6r01zbgYs0kBdSXKGVTAhOXvchvgiHXrRdPqj95FQKGfC5ZjbS582nARK0FyO+ThyCdcL+sMbcd0K7q13CbA4Lh7XNL/oelLAShQtVu0OmGV4uG2bgdBmJK/2ACloVvweD3qLKOm7cXBD4UTztA3Znl16Mi0MxnsBiYIZQMsjDHGqOI/QZIWW3od0FydPYpCfBoFaokVgOo6H9g5rFCs1/3cBkUKKVHCyVjzUnYQX1Guu9xdHeHRnv/xMdQ== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0232.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:327::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.37; Wed, 12 Jun 2024 13:56:02 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%3]) with mapi id 15.20.7633.036; Wed, 12 Jun 2024 13:56:01 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jun 2024 15:48:43 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [VMS5PmB6XjVDbfzHqEMc5caxC/2TUcFuhID3gGwjLYY=] X-ClientProxiedBy: ZR0P278CA0189.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240612134853.2102377-46-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0232:EE_ X-MS-Office365-Filtering-Correlation-Id: 85b84b63-a74e-4485-ba27-08dc8ae76502 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199020|440099020|3412199017|1710799020; X-Microsoft-Antispam-Message-Info: FQPCxEOoAwlJ1sMv/WTvGBtaHlkfS3IjyQ0KiyIhK5nHAO4+GTdMV2I1NYOtacJwZxGvoTN5Ji24LEQRF2Bls2sIc/Rfe1B66uU3ldKWXiWM4oG/dPgwiZszRyDsfJpnOMdRGpm/tiWPZGbIU/qLEKUKxRD+VcbQPGAPXalFNhJpdODas4pqJZjWYBmXGEt2w3VXhRiB4UjK1OCk58sep6ruXJadlPknJ4b05FjC7oEhSloiM7OPWfhPlGSzQAHXLHoY1SH6hweJf1A7zDDxIfP1AsolHRoepze+OCLq4J27NDlusvBf+DsiTBMv13Q4OUxBTeD2JW+HY9IrA8c6+dE4Orjau9oPPbfTnjYpF3uqMXp7pD+qAft98mHJiMExejYxcT6rufvUseq86E1gcO+a9apMSXbFlEIjvhGpdIq2H9y0B/iLrGgghOtnf7JG80nJB3RuqX4F0N3GNsHUCUHYsHfdVRuOQZUIfTXUoIXIziZ9NkJZsmpXe07QVH+7xOGWEK8OJ3z3hOflA+CX8J7ObNF7Wo+s0N0qAMH0Rzap3YufrMgsb1xYvJpZAEH7U3H7MrIdfb5YL3goADqPB6IJvxJxX8KVlvxV9nFr5uMEezEhwVv4d46AbOAUH0jH X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?BPDmtcZdLh/XResoc4IAYf2MEt+qryVWp24cMitpnDtpYVTGyTiBE8kKBn+k?= =?us-ascii?Q?ta95ZoXyL1PVLWY2yLeP51Wyad+DB33orw4VyXYHFrZ2ttoi+ivl9IHuezf2?= =?us-ascii?Q?mFYI04fqOlytUDtykNlM7vtoCTuRbQtEZTCegn5YLYC9gsr81zhxm2QS3Ixz?= =?us-ascii?Q?VdM8ODm4EfXFdiGBnHkBt1sIa+0qJP2YAEdVgi8CGmbo41MCJLMYOUkYe094?= =?us-ascii?Q?i7GTILNUnDgB2qWxC63CrFPkLxyMepzcR9Qm0KZ6XIk70WW7/cYF6QSAVw5b?= =?us-ascii?Q?YMmNPCn07QumVcJW7yuzstZ4+K0z0s+qrJnxyJa8+5dIvAiJb0jiUuVxxybW?= =?us-ascii?Q?FTw4MKhyhllF4ZYd3NSGUHDJyrEH2IHXDKKFFO8L293HPzGHcJ1vSLQGF6IB?= =?us-ascii?Q?La8dP4adbFsJsKPrtlU05mjWH04Ux5z/j+VwfI/h+mQ7Akfn5hZTlsEL/dzz?= =?us-ascii?Q?zkcP9nFmqlT6re9wKf77gOXpBW9zt3fdVF3YUy1uEXy258JNhvcxuz++YVNw?= =?us-ascii?Q?cESJhaf107YZj0g7uuT1O9zT5L6ZLPUROj48X27XS1vFid8Tn0vbvxwEUggW?= =?us-ascii?Q?9q/MGtQ+myCVso0Yaug+1kbHXeOsZSmnooyqfczasOvKbxmvPL5kZreQ7Bbc?= =?us-ascii?Q?elj2sQMJdKasWT4z/ThVIW3hKO5YvYG0WZCkLgPGhCUOeQOwhynVEW/uRWt3?= =?us-ascii?Q?MPWlkyI7JrvvRFRyGDyXcrLBm14e0ddUnqGsaxnA+ilcoEMUEX75Cjhq2VY+?= =?us-ascii?Q?v7mwmw4/Il5JFaFz0FfNWcicyXKbauLROXESK3EcnFr8yaa9TFUC2XHzVEnS?= =?us-ascii?Q?jNzuHWpK+qFj+F6yoDLs3+yt9O7liB2i1KW//QgmSHDcv7zWu6Fq1jTZy7Gk?= =?us-ascii?Q?6rLsaDB7apsTat8xurfHo9l6O60VRYTN95mFJ8vXK0+YncVrlpV05tQXldo3?= =?us-ascii?Q?Y04Xomp83dkxYFbTkj+IJ0GZh0QfEul3h126QS7Ohk4hZN5whsksO/eOXq82?= =?us-ascii?Q?lSONpz5gbmpG64QnHPYay2QgSSo3uQhc822ezbsdAB0O28ni0ya37U7K1JZL?= =?us-ascii?Q?61cQ7oLKhcVZ+s+48tdYLyisFnj4lg9ZZJE5Kr+l2isikIeNmQFu/AFbSHnQ?= =?us-ascii?Q?xTMmhAzdellvRt0QIqUVrK/f4Uky6m9sgHRdtsToL7fjTsTZDcra0fCDsC2L?= =?us-ascii?Q?k/C49RBssHPaxXKt10Ps3v9OIusAwxTETa8lgJnlc+V7f9nW+kzGr7N39XOX?= =?us-ascii?Q?P30gYgmHw6mROt7So1ATSEkGrOMHmzRHuzan5E8LbA=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 85b84b63-a74e-4485-ba27-08dc8ae76502 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jun 2024 13:56:01.8949 (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: AM8P250MB0232 Subject: [FFmpeg-devel] [PATCH 47/57] avcodec/mpeg12enc: Pass AVCodecContext* directly 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: Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg12enc.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c index 3948dbe599..b840fe887d 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -137,16 +137,15 @@ av_cold void ff_mpeg1_init_uni_ac_vlc(const int8_t max_level[], } #if CONFIG_MPEG1VIDEO_ENCODER || CONFIG_MPEG2VIDEO_ENCODER -static int find_frame_rate_index(MPEG12EncContext *mpeg12) +static int find_frame_rate_index(AVCodecContext *avctx, MPEG12EncContext *mpeg12) { - MpegEncContext *const s = &mpeg12->mpeg; int i; AVRational bestq = (AVRational) {0, 0}; AVRational ext; - AVRational target = av_inv_q(s->avctx->time_base); + AVRational target = av_inv_q(avctx->time_base); for (i = 1; i < 14; i++) { - if (s->avctx->strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL && + if (avctx->strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL && i >= 9) break; @@ -154,7 +153,7 @@ static int find_frame_rate_index(MPEG12EncContext *mpeg12) for (ext.den=1; ext.den <= 32; ext.den++) { AVRational q = av_mul_q(ext, ff_mpeg12_frame_rate_tab[i]); - if (s->codec_id != AV_CODEC_ID_MPEG2VIDEO && (ext.den!=1 || ext.num!=1)) + if (avctx->codec_id != AV_CODEC_ID_MPEG2VIDEO && (ext.den!=1 || ext.num!=1)) continue; if (av_gcd(ext.den, ext.num) != 1) continue; @@ -236,7 +235,7 @@ static av_cold int encode_init(AVCodecContext *avctx) if ((ret = ff_mpv_encode_init(avctx)) < 0) return ret; - if (find_frame_rate_index(mpeg12) < 0) { + if (find_frame_rate_index(avctx, mpeg12) < 0) { if (avctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) { av_log(avctx, AV_LOG_ERROR, "MPEG-1/2 does not support %d/%d fps\n", avctx->time_base.den, avctx->time_base.num); -- 2.40.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".