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 9BBDF43963 for ; Sun, 2 Oct 2022 21:18:55 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2B2F668BC20; Mon, 3 Oct 2022 00:18:46 +0300 (EEST) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075047.outbound.protection.outlook.com [40.92.75.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 051EE68BBD5 for ; Mon, 3 Oct 2022 00:18:39 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Mmy8YuVCO29ZEayJVoqqli9UclmsjREXR7YTj6mI+PTvXYs5/UU1VFbuF4PNqvAVyV+E34lf+LAOiGcH7U6HuoAzwvmU6wgzMdm85HZCOVI4ihacOedovEIebhi+XjX6YlXD2UorrLyzWeJHgav482ThELaN9asNAj/XnJLXV6duQR6lDx/7KHWauZtVKlR9m86O8xlzy/EvXLfvf9HVy7thEKX5ZqWZ5nNooZAAxLPqtU2Rpsqi9yYLCvkT7/HrZLPJImA7zabWNOxOLj6oXVb8PmTvhECYfyqd27IrxL5+MXImtTy94u8groGFZaVCm5SeFCrs9+iS3zb+A+KlTA== 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=dHPybXiAly7hVe0XFXaQc/xlWp00Uqa/isJUK4Ltsa4=; b=mfkq35h6cntk9fhfkvYXCmrQdU+swKLo1x1bCsmklCzeZZSEx23BKNmbkSIIjrxKa0zS7xoXA1/AwpMpPMCz/XhTD23zlIDJ+vCG4+ZN051DSrmdEeetEScoTDT8WH1b/H3+51XAP/0zorJTsGXj8mxX5sCuj2q+p7+l6nkWHNRdnqOrd1rh1WKtg3pYg6mIyjkQXyPXvMt4G9vXVVdrRompSvTpgoYrNrCW0kpkIHnFjw2HnIrtS8SVjtje9qGMewMFiv4635FIVwn83LGo3o7F51wkOByod2iHcfQmzm4d74WB2sEfaM3EgvQahci5coZwp6pfw7ZbM4SgRLogaA== 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=dHPybXiAly7hVe0XFXaQc/xlWp00Uqa/isJUK4Ltsa4=; b=CyGNRAcsFFLoWEhgekV1NGkmLYN1Ur4bTtxX6u4fYcGSZBbiawvMmXeLdgfez3Buqj44MCSw9ReQdk9yuXe0T9rjgAykdiPk6ygxh68ZdLrcFtLfRC/1xEGVTL5o4EuaPZ7hqfckh6L3bIyYCyxIKHXeE7xG/vQt1SMPeQv2eCKxl+BAstGstB+8QegJuZfaWh20dejxwZ4qWEVx+4GzmTbVjP1RqDiBeraG7d+SPJ+DuvLHK0Bet6ImdkCCwgOfzv/OABdFjx0AEb0XD1lFOrWiqfOHancFnBWl2mKdarigmPVpgzDRkoU7t455FNcDkgazwrgMiEFuQLrv3Iz2Dg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0290.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17d::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.28; Sun, 2 Oct 2022 21:18:26 +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.023; Sun, 2 Oct 2022 21:18:25 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 2 Oct 2022 23:18:15 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [E3JBXP2Wdl/KxIcI7K0IbdGECNSeNQ1oeJpd1S/ubFY=] X-ClientProxiedBy: ZR0P278CA0180.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:45::7) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20221002211815.959423-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0290:EE_ X-MS-Office365-Filtering-Correlation-Id: 05012465-885b-4174-0a5e-08daa4bba4cf X-MS-Exchange-SLBlob-MailProps: AZnQBsB9Xmq9S+lyC0Rq4VBpsdMYmcOkCzPxyfReIouUax32FMHUi/ib4i04qZZ65/VN/Z6WJoL2JDWzGnd8f/dK0e5QX48GIWLwAu+8HH5ZoQKxweVqat+7VkwJD8r2wYJldx/Zm8PopDn1ncJ48V6LGoeLTsF5oAb5fEBy4I+K//NYAX0a0WBgkZsqCYevJjJe/iLtLhPtvpRuOBCLB7Ah11BS14DBNPdHBNtwOX4nGDJaYqkElH1ykR6FwUs3+7kpOk5iYQ1BT+GGgzg5P9bsvDJAZq/z2KW0vP2PRvq61mqPLu5N6Ymbft1bPF8eeKurB7BddsoG1AEdZ2U5nKLxQWS32OEZo6DI6qAo3UA/63C/7GAZJOH+hjAPvrxQ68HKk+Vf2B3zbNCIP8HNm/RDHhECJiczWgYHHuUxDZrlH9vePyJginzCZ3nzAYv5XdkJwmyBhJOSinklBalrp2gRjrsyHOT5YyXjcQHF9kSBNMCNWYfUEN3k1FU4zxd7P17mUm4H8Ged5bkexvqntF4TCvHdM76q8fok+nO4sIkznGZqCSE1acNz/I68a9uAKybpx2XGqwzPKv+Wb4la2VUA1bvRrcJ+VZlzATjWw2kSdYoqzdUZIHYSGZW2UBuDHmlo7XCN4+3PM2rFDVx05UX+Tbo6e2iGdWcdynuTn5+zmh2YNeenvM9LNWP4OinupkzDRcDHfaQL+u+WISHtDkS1YihywI11iHZbU1nUuN3n1LUIwZpOhwa5+3gNRlrQZCkDrJM+Ad0= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Sx9sWhSxHmhUUnzmRGz63TtG3P5ywtTJvWyIVs5yOJbTqMPMZHx+D5MXOjX+5SmHkWCx58psugDd3OFST89l5EUCxuzzrs1nENfMOnbj59xltBL1XnQaqyjZQLBVQ0p7IHXAnuhd68YmpMy/avNSJibzJq2pitwRZIUeB+f6rY1OX4XdWjiAxDYZ394X7iTfEqtQwb/IuI21IRYyvmpcklD9EcCjHAlvpVgknh/gfVv/OH/QTwuS+XMS86+Ib9xmDO5cHUau3Bgl1W3VrdnioTEhH6fg8zGHQcMSo6HIFrOMSwqVY2xiW2Hso2P5y/NTYupKnlLyMeQhtvdpc+rW5vtGCpFWz19mESYSdyXEkRCkvrZCBAFTsfI1q/TyceOHB3v8BWHPflHe7olQnWhWrvaf1Jka18b4sb+P5Q/UalgxoB95eDhrE2ih0zn5aCXF/FpF/X0a2Rox0ot8A18yyCC7OUDKxO4T/1pBEVti4h6R3C4u2RzNovjbwVSlAuLAFsbvjHGj4DftzqBsEe9YwKUC/P5OVGjZGqQ5el0RmwA1NIbzFrg1c1ehx6LrKkoyGHMvdDceBI3d6UKx6garIAWjGTsnfvcZ5+UtbDWOaPegYITZ1LKTq+4FKii9N5gSKCj3FHUMSbl7FAFPOANEilfAoPBnTl2qVT/naW2Lc0ObLdEQqQ7ozZ3xXbbYEmX1 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?xAm0YMCh0qK82Z+9wGJStO1DE7syjRt6Ec+jNb42AHaEA7j61AMzbFgqy0Pu?= =?us-ascii?Q?Mocwnzq7GH8kVNeMkDKqBwRiR0kPJkuKHTDRX5OSNyXURcYslvhCYOmt1sSb?= =?us-ascii?Q?QTSE9uLMntNIPoVQR61MTtthfa1vX16WeFrZEB/n0JdgKRtZs4j+b6P3KH6t?= =?us-ascii?Q?qFcyiGxcDODG6mrDqi+tvZN5RaO1r4ZuX83FS/HcLrKhiFWh19su/4uwpjgm?= =?us-ascii?Q?0JB/wfjK3i4rAgYqHetxG+0gai77SrsIcv01v1gjsXanVtXCyyQ9W5BnNKm5?= =?us-ascii?Q?C3rFFzRRN8FLio5a/PgZS5E28xMuaC16Gfxcyeq+LOLkmSBPhFAItC1VhxFL?= =?us-ascii?Q?8Qd2c07rIbaFJlfWZdnI1EH+EP9OtC3uZKx1A+1nMm6p4VOccn40Ehbu8N+c?= =?us-ascii?Q?zTznODQuYJoUUvaLCQ80eteKD2yytAF/is/V7e2Mtqyt0RClgWb/jH/toQSx?= =?us-ascii?Q?B7Bqin3q9KLcIJ7FngZw3cZZwA/H5sDWb/NDyVZbvbUjTSxJC+9eIxeRXKXy?= =?us-ascii?Q?ed3UU+SUfPKED5/PKl1q9b/1ILIq1zPItS5QvOKgDDpSNO+xhlLTgttqNnpV?= =?us-ascii?Q?lR+Gqneb5Ap3LeVVAJvxkuUX131lqbGJf5q8ZRldhPtTTB5ZXmae9L6sBLGZ?= =?us-ascii?Q?9s9PBjInSFNHrC/w51voy0ZRNGr4Ly3Ip2v7yxVmmDmBZObPCaRQ+mSqjq9y?= =?us-ascii?Q?t78UdrQIYpAbtr5hqXmOZugCKdLwy2p4OSfcwEfj1uZ3doNc4JIbJ2TJGBFG?= =?us-ascii?Q?N6ZQtx2zjL12wSZnfSd1dOaulfhYoOZkrgr76gpxGdqzM6mskrnbqwudITRk?= =?us-ascii?Q?gyZiZiWIkeQRk9n5JTVfHb1fq64LMZg/0nVAtVkLNrQ/jQIzE4biZa8Hxref?= =?us-ascii?Q?yoZu9s9yn5wuLePLTjVLt7W1iSIak7qApLOUJxonBNFof98Pwm0gLJ704YwA?= =?us-ascii?Q?wl/L5dNF4yzHjndq3hUpBCFY6Ow0SCL/xCUlngeZsOMlXYp9DWjyGVXjBUlu?= =?us-ascii?Q?UTvPbmhXOjgg8AraVE7Je2WE9YZGmaa8iL1RW/SnBF0YC8cNBW3GaRDzch44?= =?us-ascii?Q?wATOmG4cCgZk4rzVb0psiAXi8NLOfm1wCTzgKyKh51ePlq5TQLntQtEH54Ou?= =?us-ascii?Q?57SixGETSCw2Uk+HL7fYezdP5P2tLEn+kA2GO7/Vt6/98woPau5KZ2tfdu7T?= =?us-ascii?Q?cm1SwA4a32mh1Shn87G7ISrPXv3jNI0ZaUe2Q1ikiLuATaHfuZcgFBt2T/QW?= =?us-ascii?Q?KYiTj/QC7FkUa3TsjvzQPU5yCUTKHl6aYuDj7SJasnrpkEpSYtuClQfvUV8m?= =?us-ascii?Q?Bf0=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 05012465-885b-4174-0a5e-08daa4bba4cf X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Oct 2022 21:18:25.8936 (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: PR3P250MB0290 Subject: [FFmpeg-devel] [PATCH 6/6] avcodec/mpegvideo_enc: Call ff_mpeg1_encode_init() earlier 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: It does not require anything that is being set between the new position where it is called and the old position where it used to be called; and nothing that it sets gets overwritten between these two positions. Doing so allows to remove a check lateron. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_enc.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 8d74f9e978..f0fe35d7a3 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -647,17 +647,17 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx) s->time_increment_bits = av_log2(avctx->time_base.den - 1) + 1; switch (avctx->codec->id) { - case AV_CODEC_ID_MPEG1VIDEO: - s->out_format = FMT_MPEG1; - s->low_delay = !!(avctx->flags & AV_CODEC_FLAG_LOW_DELAY); - avctx->delay = s->low_delay ? 0 : (s->max_b_frames + 1); - break; +#if CONFIG_MPEG1VIDEO_ENCODER || CONFIG_MPEG2VIDEO_ENCODER case AV_CODEC_ID_MPEG2VIDEO: + s->rtp_mode = 1; + /* fallthrough */ + case AV_CODEC_ID_MPEG1VIDEO: s->out_format = FMT_MPEG1; s->low_delay = !!(avctx->flags & AV_CODEC_FLAG_LOW_DELAY); avctx->delay = s->low_delay ? 0 : (s->max_b_frames + 1); - s->rtp_mode = 1; + ff_mpeg1_encode_init(s); break; +#endif #if CONFIG_MJPEG_ENCODER || CONFIG_AMV_ENCODER case AV_CODEC_ID_MJPEG: case AV_CODEC_ID_AMV: @@ -895,10 +895,7 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx) ff_set_cmp(&s->mecc, s->mecc.ildct_cmp, avctx->ildct_cmp); ff_set_cmp(&s->mecc, s->mecc.frame_skip_cmp, s->frame_skip_cmp); - if ((CONFIG_MPEG1VIDEO_ENCODER || CONFIG_MPEG2VIDEO_ENCODER) - && s->out_format == FMT_MPEG1) { - ff_mpeg1_encode_init(s); - } else if (CONFIG_H263_ENCODER && s->out_format == FMT_H263) { + if (CONFIG_H263_ENCODER && s->out_format == FMT_H263) { ff_h263_encode_init(s); if (CONFIG_MSMPEG4ENC && s->msmpeg4_version) ff_msmpeg4_encode_init(s); -- 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".