From patchwork Mon Apr 29 21:14:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 48396 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1509:b0:1a9:af23:56c1 with SMTP id nq9csp2272163pzb; Mon, 29 Apr 2024 14:18:53 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVbDitH91PcRQOiCwI4dhE9iaKNbnYyemcxiDmhu1SxqCE3+g4q5vFsinNq3HapGbF/uXlO8jYlxRxkwsDnlGRmr/XzyGossAC8SQ== X-Google-Smtp-Source: AGHT+IFMq3VSyzl75HOYNBKbw0NY8JuQCJKNMqxQOlc3Og288KWmWEA2cvIU5T3io/1YWSwvM/wT X-Received: by 2002:a05:6512:1328:b0:51c:8b45:c9fb with SMTP id x40-20020a056512132800b0051c8b45c9fbmr8717356lfu.69.1714425532671; Mon, 29 Apr 2024 14:18:52 -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 by20-20020a170906a2d400b00a58ede89a1csi2800664ejb.1019.2024.04.29.14.18.52; Mon, 29 Apr 2024 14:18:52 -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=Z9H3KseG; 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 8B21A68D550; Tue, 30 Apr 2024 00:16:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2064.outbound.protection.outlook.com [40.92.73.64]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8327568D5A7 for ; Tue, 30 Apr 2024 00:16:24 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oAXRJogwgPv9ZWPBHvgIsSJKyfrMYx1Al92IUkjK4IX7Zd7kkPQxuFfD0N2ZnZyMdP7YpEu9pManOaJvv4vc7PXjPGoVr0qZSeaB0+aKKlcXaKjMQlLjwgI6V5aXXcWTCiNaUv+RpsvS2jZ7McK57CYQqy+iu+hKfe99ecR51gdOqfK1G9AFN9kzdFHSqSZJlP+BZFvkE8TjHvC+lvWNhE9Jj7l6mMDghoX/wKQUpCdMgXfAKDDP4UmI8FYNipJ0ULO0Hm43vTvEMEIOMaI1aRA85AYwhNAJYvIdlHZQULoocE6TJJSzBXzxGruf+/Byy9fxMkYsa0PKXb65RIPB6Q== 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=+vl7fhXvHkbIzD+6SHD2GrYnQpVOMSqTp1go6MFz+jc=; b=dkODsZb64jgfRYE6JkAVtHb+7/hUUBoB6wLyqhNjkzKT0EXTjy/3bm/4x9smudznajL73yShcPDSQYIK4h3gGsNU6kXMTtjljIIkpzXDPVLAkTF6+xbTNzd86GX7zJ8gdFPSFdCKCeGkq+l3nAop/K5fQWWJs4LWCiPF7DqKuPIsgSXlm0CkuVbWJkWgIzE2cgKPV83uVb8iMnpr0PGAiS+ji9aojFexp1ZKyG8xgF2iPWWUSKoqJqmRaTsQBxIoUGg7Fr6hK/axGYrvh44VrwOGM1rQfmyaocVX/gnGJAPzmqtantgeGXB0/zxNYnedwh7C4DNpM7v6/2fitsxYaw== 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=+vl7fhXvHkbIzD+6SHD2GrYnQpVOMSqTp1go6MFz+jc=; b=Z9H3KseGgGmhmJIxw+EwuXjDQFukEgIS+VeiPoFE5SXAjXF5exeBszXcw/GfZz/NXDAiT9UC/FFx/qngdpgaPvtoHYTePthZnMojoON2WPBZccfseki1z5aftcKRZJr9QUvUAFnn6aafUU9ZZ8Ui3a/lp1f+w28K1fujk3z2LkgoZIE2FLHXFrZWMw9atmB4Y6kNnlEYEL/gFuMP/QipdGsDbqPnjlVPRDYFUQu1sUIrAJt+Kr2WN+x2XGXj8zqG/aOtwVxoc6ydPKFD5qMMjyGSxpKu+VSiHonJBhDkn/60cfRWjmBHGXFy5RFW28R5VGWchfbTcA32ixEBAhMVcQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by GVXP250MB1057.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:1b5::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7519.34; Mon, 29 Apr 2024 21:16:22 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::1f29:8206:b8c3:45bb]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::1f29:8206:b8c3:45bb%3]) with mapi id 15.20.7519.031; Mon, 29 Apr 2024 21:16:22 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 29 Apr 2024 23:14:20 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [yZX6Wfr9DTt63O6v/TNML0CZHHOzVzIJKFRJxhMiuqo=] X-ClientProxiedBy: ZR0P278CA0199.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:6a::21) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240429211438.3274834-25-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|GVXP250MB1057:EE_ X-MS-Office365-Filtering-Correlation-Id: 5496939a-bb47-4ebc-680e-08dc68919efc X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: xsxmEwHncpN//RLoPcjPJRrops8ckc4bH7lgHe9zQ/TgE/NMLZW/c7HIvrT6VeotUPFGAh+y+6YKner38U7IVPtZPwMDNOzeFeCz0NWQPD5rNmM2pvViM+48CvwP5lY+H8AjWZsMKPbgTvg+53k0BH/QuiSV7jHWyybIeQwJiJ0IoDYtL5JEa4sKfYdVUN5aOA/r71eDK/rht86CUnK36E59YIe6HCWaczTcZ1gObag2r2PTlWOMdRV4QCftaFXW3YGSVDBOhGt9YSNxr1JtBO+/lqaoaFAU0LDLWcRP1hJpTCocKCSsFs1ZunRbWdQHd01oXUXbz7NAYeKlXETvl5BjKYDkFuoI8PVTlkO90DQp4DRvuDLTc5uYZDUyCf35HGtc+ktKgxutne/oLoaT1oBCnGHIx1NmDVS9FTFQqG6QDWrjGpG4GiXeSk1tCCfAeBcjkUxzFD//ionaK8pJYTk7HRmKkK5+T2Q9jdFCkJIAOQaHI3urY6bcxqWAuKcCuGpLvHAIMFdFDIDP/8ASKm9PNyCh340ExPPq6M+BdFvc5rhomiLcR1inMySB4XEVOYNJY7r4TnWARAxnbdyWbzO8vAGMTSRxPKNspdlPdtEaat07GHbgAStHA6KGPIsu X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: tteRRB34FehlviZeQy7PcIZYLnBUfa5gebLvUAfBBOELTMKJFuEQNCE10RiXXJnY93pztiBAocU6PkIJgA4wHka0ksuf8pQqqPBSVmBYzKOFZfx7W5yIL0GQArdkse7Oexyb9iyDT131ocavMVgOh7HIGpX9JuAPWOzS9WWATowSaIjCoCmPXUgjC/H27co5sMKsa+ZQ9zNsUHAUZRjhFx+HzFSNKNC6yEmnWYyzgmFGM3K1SxUgWFMkbGQ6Qm6doNWFJ6+teo8A1yMJBzBe5o1gTElXaEWrzFoawug8tXV1mj9XabqQbp4C8riLkcHp5s+R83ll1/IUfgTl1G8crX3E21pcNTd7T3Xns1dm8l0TSIoxL42K7UpAVkb90PNy3LuxyKrsb7tvXjeImsYQ8ZOMgm13aNurspOTgpSBvzpPyO1eZ9wN2orpA/ntK9Xjwy5AD66/ivmlsol9j+GIu89qPY0lSCxlAaie/kMJD8NSWl1npCC9LO0lLiYLWCl9bn8xqkgs1S8iy8KeS6teLiJeO7zM61xQrZDxP6+TUyZS5QUl/8mEV5qOoDf/IXDdv1w64vhdNIp4IFKzzQoMKsL0/lyOtXUp4nTazbRrYIn21kJNQnpdRquexLoi+74ZRXzC6qxc3BJuqQy9l59xkRizWRLKqXVKIIBL1bV+w2H+yujVmfVCam6Gf2W4xEk1auwzr/ivnbOrx50vKvCs+jBltRSHq1yG792qM7qOzn6IkC6o5PTE5BLV+vuox1f3NiVfRIInLwIMEDCb2GLExMXRgC3DExt85URDOvFy1a5FL5pY69D3VJvgr6f0M08a//wA5esHM5eDc9ybxipbjf0QsK9WRPDEIl7Ok40H5kDEqVKmRBxV7aG4tgXSXvILtCjFpxG7JHd3cA4E9HKZpcXlLywNdPsPGmrMJEf6gFnLnodoRZkwXy6pGS3Tez/BRPh9G+JJsmLzlohQX0PriqvFIWpBaggthT4cU3qts81Zc1djZreVjbDbjV5cvpxu55saLga90oTnkfJ+VT4OgCFdlxB969Fn/9j8hFAJJRwXPT0WlDsPwmXImdqTkAxWj3Wmt1QkMITHnNd/jZjBeGD8b28hv1hZ+oztKk6ctISGHDltq3A7hDM8os3pi1gqw8s3MLBqfTrRz6eDzCI/nWc5qNvOm4I6ftG5ROBNLKrZdOJq22L6x2EqrcirB+NikYUs7Kab6zdHkTIi3BbG04Io0gnj9hFEDGSnL/IFE6hwH2g5glDL45+GDd5caCy8U/UWQRdypMJTdJhfHvAG8Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5496939a-bb47-4ebc-680e-08dc68919efc X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2024 21:16:22.8803 (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: GVXP250MB1057 Subject: [FFmpeg-devel] [PATCH 39/57] avcodec/mpeg12dec: Set out_format only once 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: d53OSnKg2R8Z Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg12dec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index e573d3cdff..0e2012b324 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -794,6 +794,8 @@ static av_cold int mpeg_decode_init(AVCodecContext *avctx) Mpeg1Context *s = avctx->priv_data; MpegEncContext *s2 = &s->mpeg_enc_ctx; + s2->out_format = FMT_MPEG1; + if ( avctx->codec_tag != AV_RL32("VCR2") && avctx->codec_tag != AV_RL32("BW10")) avctx->coded_width = avctx->coded_height = 0; // do not trust dimensions from input @@ -1859,7 +1861,6 @@ static int mpeg1_decode_sequence(AVCodecContext *avctx, s->chroma_format = 1; s->codec_id = s->avctx->codec_id = AV_CODEC_ID_MPEG1VIDEO; - s->out_format = FMT_MPEG1; if (s->avctx->flags & AV_CODEC_FLAG_LOW_DELAY) s->low_delay = 1; @@ -1877,7 +1878,6 @@ static int vcr2_init_sequence(AVCodecContext *avctx) int i, v, ret; /* start new MPEG-1 context decoding */ - s->out_format = FMT_MPEG1; if (s->context_initialized) ff_mpv_common_end(s);