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 629164A82C for ; Sat, 11 May 2024 20:59:05 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A985A68D7BF; Sat, 11 May 2024 23:54:59 +0300 (EEST) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2074.outbound.protection.outlook.com [40.92.90.74]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CF07668D7BF for ; Sat, 11 May 2024 23:54:55 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PtEEntTi9bAMGwNGlflLMFrpV6OvJBAnqJNDdIK6gT13/l/fy2HvbourrqvVlsWPayNkim/+jenvpTskqyOaJgQCZYHm+h8FDjlv9ZX7p+KVot9TFJ+JjLTOguFnzayVLmpZU4aTfaTohvS8qbGoDuoExp2MIoXl98cLBS8fJcPMeeom/Nb9mCu0XRCdRY9DQapHmpuCf213utOaY9SQeVINKyJrxmuokINGG4yQ/fSvQ2Tm7dNgmowjULPVmjhSIKy13XGuMBAmWlKQ9t1kz9p9IZiMqrGEbYlv9vQvaRcTnNJWv7f5BZrQSdAlp3J18+NZBNmksbY0gTQ8PtBbyA== 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=fwOD2GS9cY0T6XwzMZWzHcyN4nOVuKewkznfgsyy42/T+s1+mk8D2tJoVKOy2bjhB8Ncze0w3Ak/6wWyqqxTF1mub4cWIFssmUES2Ag3LWTEjJPlDs4Q3V1ws0gDR9M7vsQztK11if3ZHOtPBkfU1nhWmSGiADFgnalaa6QPsPulkcI26Yb3V7lgpPXlFi078ySiggKoi9ZVD7CUSdY/a1bbLYA3YkJKYicc4iucyJzKBWap0dec2TjDyQcZ0gIuGxli+jjqsEisCqnTXJloa0sOQ1Q0JPC3S90RIGZrxoBoSF0My6Q7rqC8mGvb09BHJB+liJUpw3PJT1RYk28/PQ== 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=M6SsaznkhH0XqvQPQAf9cBRL0TugNLeP8IPo5Fmq2SC/i1VBA8Oy9LLGwty4vwNHwPQq5Qtrzxy5yXD/3yVg8BiHmsGCpFi2ooICexns20RYIpct4bmpwG2LlJQXZGaUdKQ1ylRk6sShihO/jSY6QEHVtZBn8RlFg2jPWRWUNYzS7wUc0+IYskdM1idyDOdncyg9SQu0LxxdY3j5aDsjq3ICJeS+6h6fZtpOt9H7Gmn3UW8Rwf+5UrFEqsY1ur/NvHsiu2tqS3vAaiwJ17+IXs7q33Fpsi06lLlHjnF4DDEGGLHBohDdpbJeSw8pUUu+epcw63ICydWWIaK03o0ZGQ== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0070.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.55; Sat, 11 May 2024 20:54:54 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%7]) with mapi id 15.20.7544.052; Sat, 11 May 2024 20:54:54 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 May 2024 22:51:15 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [QyU/q1g+FeZ6NibgVDlybk39b0zUxA0xpHTcGQG5lZQ=] X-ClientProxiedBy: ZR0P278CA0172.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:45::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240511205135.2411886-50-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0070:EE_ X-MS-Office365-Filtering-Correlation-Id: f733a262-b870-4b8b-29db-08dc71fc9be5 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: 8y+etuAr2F5u5TYEgglxzw230qMYw0yvht+jbLESM3qrY9siAsvDhDYbQgRVWAMJgi6my/sHsRRSgOLGpnS+9OlcTXPCZ4+5dtP0T/3JgZ9G7xsoFyp5RRiexgS3lCqMG6viadZZwHg9UjhSv4U+6Bd811difzid/EG5YEO9JR/vMjS4chxkgOGzgDc96hfK9Y9UMUZHc9X8smiZK15cOOzs1sLhxAkGIzc9Z6hX54LTNXHMF6j8m68beJgT8Tuze0yq2TrYPh9+1ALPN50mONj23pb+GjWDMF9s/WR5NOwvU7CSNhkgBlPhLZyFvWlsOgyeNoTyg27ulUH55TKwwwlFGaBOjfBxlIP4WE1Uaq9shwEYiTEltlSPH7V/1233KMUNhqaTUiBYwo63dD+Y8XxOL6QlptHgD6KHPSOfwIGxLpuYBGQ7mLOWfT1898KGzHw120WudJ0rG/NayTyVD19rnEtvtWvSUS3GkdafnpdLrM4QkTe1d7V2D0CiLgZGGIxcenX2wUDkJBZ37rizD+KJdgESWLKaizVt3MKnASF/bmWF19NSWey2bz0HoWdQnGck/wkqiJPwLvDbdZszUFUpfEbSzanXBkrTCZwtl2pO69JmOBFKQojhfleq2g5S X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?NS/+OsaAqZewwE32v35euTPvOlUontNvuJT7thUnD7rxKOMysdhoB8eo+BHG?= =?us-ascii?Q?LL/sZ051UQ9eKEm/vWmTXQIK5E2sHSqqhAbsamkw9Rk8JIVM/eJypEgWLVqm?= =?us-ascii?Q?LzUJ8ufxh/abcbmPf1D8UOPO5ZsJqvgYm+yGHBv1mWJbcXwfKGGmtnjcoYaM?= =?us-ascii?Q?e88+bSM1cgJdihXXb2eWLAyi3EgQuNiPXKGrsSHgNg+kezUaNH9qsSwum8Jd?= =?us-ascii?Q?T/AZYaRmMA3lBmENiwR4RmCqEyIlb3SgjmjOapIUfJq+t+EQwnWxBSwUHSbG?= =?us-ascii?Q?dZUS8WLdHQ9yaBmbnDvmOSt12U/wxOcXpdT1y95O6XUMcHN4mLlqUI2/PweD?= =?us-ascii?Q?z39GQPD79DxM3//Yc+tAUZq/UK0iM9K8hXD0xdjGnzKoTZum1jNM06mFa3gh?= =?us-ascii?Q?1uXdRwGyKvFzKmCqLPijSeoIki5HVyVkELOV4vj+I72CiE4GbnRuGPjacVJR?= =?us-ascii?Q?RfwqnsVMsgB9Q3UDDJAoa51RbP3kCJJJ5DSNaiXj/iwaBfmqaXmfXQ1kV19X?= =?us-ascii?Q?cAxRy7WKmSTpl4ry7fB6MLVZUnV2CoTkOuUIciPJ0DDkTneABkHGoNJJfgGm?= =?us-ascii?Q?gVagTNm0CV4V6YX8dzfNtls+frBHk8TBFLgCDyIMFTlvzEeeBjapztiBljy6?= =?us-ascii?Q?Q8UQcJJqi3PAfl76ddSj4hvk7Y1h3kOMCsavqH2aOiFtgCx6XP1LYwYcsENj?= =?us-ascii?Q?fJFelrkxpnhNjTGRASMvSgDFApNp6MXRozfZQQBYX7fF3JBFRBlQXVeOJYFM?= =?us-ascii?Q?LRqdeHzAD6b1u4PrqpbBVwLlkmDTl1mlaKecWx66n12P/KHJnykBvRf01uQ7?= =?us-ascii?Q?Exg1+DQzLbSt6j1dkXQNbF5bNaMvuk8dYxGKnGH1I7AnMxLVlrTk3PDyaR5p?= =?us-ascii?Q?eKonfbyKs/CBUra93GtnaNXfW4Qewey+JDzJiRhVhdMzHOkusvmtSstYtsCl?= =?us-ascii?Q?K2oXkJo/MI5OX0NDeSeCOYNgJxqr+Wb7lIPHNYgQlkjIyhKHfZLyjYZr8i6E?= =?us-ascii?Q?4U1Mxh83oistq2cet3EF1TEqZ7x41Ol0EkYco9n0a5wNH1Hka3ml4UKL3/xZ?= =?us-ascii?Q?IpFk3qylduc8bUVjDpUaXTjmhYemWL/chKWPZzSyAWzLKHqhlZXRb7lxh5fo?= =?us-ascii?Q?/m6HPcVQv2xfNHRXRvJNeCOexuyATh5YLwH30WdCkNjC3+fUB+P7mgvewtXD?= =?us-ascii?Q?oOYX+U6aXNNRc4/HEbhEhnb2kmu5iaGzQKKU38atavN/o6DVM+AdK3hdbYrB?= =?us-ascii?Q?ldPoyl2Qo12i/l5F1xoUJIlJZYK5aquCnxF78TxI8g=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f733a262-b870-4b8b-29db-08dc71fc9be5 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2024 20:54:54.4073 (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: AS8P250MB0070 Subject: [FFmpeg-devel] [PATCH v2 51/71] 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 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/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); -- 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".