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 9085B44F38 for ; Sat, 10 Dec 2022 10:51:15 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 108B068BD7E; Sat, 10 Dec 2022 12:51:13 +0200 (EET) Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02olkn2096.outbound.protection.outlook.com [40.92.49.96]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5FF0F68BACD for ; Sat, 10 Dec 2022 12:51:06 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BYayGJMBdw1uYH0qNkMFVRZlGsxB+CeRF0zHMeMrjmAw3ujUogZDCF+splfK3nqcghOi9gM6kKPkwRy3zN0s1oSO8+OOI/mSYr8BifOyLVQWf34fwbaxyFQGi8a5kJm+RRXe13UREoIK6gQbIiwuI7am03NU2kKAQ1N9JBu5FZFaoOte05Xqy4Xra00C1WoKIuohUX6A4lHnToMiEVH4l9Hr9U407b18UDa+Gbyb9mFEUpux79gXXbr9zxzwO04sT0qNNwi0o1VAIK0CS40IHgLiHNO8NLTApqUdcCzl2a+dpGwSeIDvxIbqY58NNHdqBpAiWqgDANtqONWIpR3bWA== 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=xRmz5PkXEULSl+E1m2xOuIzHKoOBNYSUfFgPFnd/dq8=; b=Bn2cRrF/yiRJbR7uQV9D1hTvV2NkYbdKqRjKE8rQC4pTJEWIkZDVc9ALwZy05iJ2Yn+8YXlJV3YVOehQ2t28mGIW882JIUAqprFxqWTBGEaPNLorHKzdWSZaUE4+Nfrg5CBeUNURNqcU8XflN2eu6G2yuHS20Tt4MCTJtrAZ/NyQ73+7RAHAv6X+0XjV+ZOqB8AiOO6oMIBsga7dds7EkSFPRWigPP9EWXlona3yQtFYhrTF1CmYL4QaaALnw7Oyk6iS0qnpYIvvyQoEl3QGAb3daCEIm9NfFYNJUB+Ik4/FVIiGFdBBSDXzFTSSwumnPSw01ew/I2LBMjXEHtKtZg== 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=xRmz5PkXEULSl+E1m2xOuIzHKoOBNYSUfFgPFnd/dq8=; b=FLJyEhuHfa0IlTn7OBAHGNPqsD6XvbRS8Nt/45mO3WNQiydzVYXya3T46RTKuq87Fxv7XGf3GASUEjHTErYwOcr9WYxUnx/aMoDPafULLbMeg1SVUp8NhJvEOgiuIwgVdFLL2Hr2zWFCz4eI2dg1KmB1I6N14z++EyQxFY/GaKO70+52rLNxeV+JPbf7UT/OHr5qU/F/UCq0ilEgs9Tkwdd7gkwMsdJ8sey2X92IsbAcRq6XvPAiABMSWd273ymJVIUdqDGO26OCZwrdlE6qBqb/zJtO1GVS4I3SgM1LdGTLHwD7H/R2VnpZYh8hb6q1jxMCbqFeEDzNob+kYpJTUA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0188.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37b::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.8; Sat, 10 Dec 2022 10:51:04 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::da14:61e3:630a:70b5]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::da14:61e3:630a:70b5%6]) with mapi id 15.20.5880.019; Sat, 10 Dec 2022 10:51:04 +0000 Message-ID: Date: Sat, 10 Dec 2022 11:51:25 +0100 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: From: Andreas Rheinhardt In-Reply-To: X-TMN: [ARliMYwRVKDM9ldPum/kC8Zl8y8fFNDe] X-ClientProxiedBy: FR2P281CA0100.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9c::14) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <69cd41c0-d100-760c-1d20-954a7595db40@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0188:EE_ X-MS-Office365-Filtering-Correlation-Id: cfc24b00-dec8-4eef-a6d4-08dada9c6f38 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ms1hgBNB00qZxIXxCTXXXvJoRBW07n9gHDpNogMskPdH+dJMYPqPnfYLexdM0dCCvWCdzcYSrC0qy63MSUUFuaS/FjmPAnz8P6/mObFSCm7URQUVUlWlzhicmalBF3cMatDQ6uWrcm7akuT1Ac6UcHARjXMqVBosONAL4HcOt9G6ACaSHkFpJvwIyiDpu1DOxI+hFhfgMf4p5iiRzStbMSV9UcCvpHyMUfQswzq//jeI9mjQmu07P6IbtIo8SPGaGeMbHZ/vHm2Z5yxfUBAi1KWrJ3QZFjZPBz6Z7z6qDDeWkLE+Y7LN3xfOgSteJnVtGQZCwbH34xQauz7m0jW+zNf7RZ926XL4G4airIc/R75/Qdbs1BalgOZ5gkvEmDSLTLxEwvT3zTZK8xW3q9m/9tKnjMtQlLMTQqMIHBJLBSLI7NW0REE+NPE9WT6WFZfcPq/1iQakB9dJQu6umqTR2VCJvc43oEvNLqhEGyz4lZFmAQesTf+bgbEWEqt42FA47sm3Bl68xBmjvkecNSFdvSSowKI2t5jbHmPKnY+UCvWuXuME3jqL/le9J8SNCX0q6KTM/8JiIVVd/izp1gdVmjdH3ecaal4WnYKJ/CDYPdnWDU7qgUubzS/46IwgCOg/xSmqey9GcusE8YGD9Xb0bGX05IkZubcAilQitCW9c5Q= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?UHpBbWtoclB0WXF1UDFwMjA1dmlrNjV6ekpkSHMvWGFsK2o3cWVlbkVaS2gx?= =?utf-8?B?aUxUL3VWZ2xUOHVQdVZUNjZBZHhPOTNOVlRqOWx1eUE5THJVOGtUOFdWMmxj?= =?utf-8?B?eFQ4dDFXYktVdUNReFFMck85KytSS2plZkxkVk5FS2VCaHpSQ05oa1hKWE01?= =?utf-8?B?VElCb25CQUY3b1NwVFJBUm5RUjV6VVRkbUxTWTVBTkg0Mm1KMDZISzIxZjJ6?= =?utf-8?B?UG9MQ0Y3VDIyVHI4cCs5dVpoU0tHNlZ0MnZ2aU1UMVQwaXNrNGpST1gzZS8z?= =?utf-8?B?eEZoZkhtSU1ITEYrQTAvamRXZm9HNXgxVTNYbjloSWVwZFBFZGxuZlhaNTRF?= =?utf-8?B?dmZnZ3daaEFqZ1NQclJJYk9EVkdoVmUwc2VQcUROZnVmcEtIV0JEbS9CZWZ5?= =?utf-8?B?VkM0OHR6aFcvNlV5cWlTUXVZeW84MU1nTElIa1Z1TDd1QVZ1UjduTmIxMmdx?= =?utf-8?B?OUdjNVdyZUJZU0RUZTNDQlJkSVpmL2NBcUxQWGl3aWxoeThyTld1bTYwVjF5?= =?utf-8?B?WDRpSjQyMnAxZWdqNUx3RWxOZEx2K29wcU9tNlJuMFl0WGtxRHdEYnhqaHkr?= =?utf-8?B?L1hiRFVGVXZpd3VXMWw2dzlHYlpEL1NmQW56WkoxcllkSi9MTlZEblZ1U3pj?= =?utf-8?B?dmZ0c3VLczdJRmtPQmVRUjMwRisxT2xaQVVCeUU5UkJMWklYalpDRWFEbDZ6?= =?utf-8?B?L1dFOWZ0cVlYVWlqeVBhSGo2VUo0cmVtdHYwTmJ4aUlwYWxPTmJub3JHYTFp?= =?utf-8?B?dkVKTTdRVFRpME53YzhaQmNra0huTlVqV212M2Z0aEdvT2JNTGZSWnNOZFVu?= =?utf-8?B?MVBSL1BzeFZrUHFibFkzREZ4MzRWSVJDZ3oxaXIvSG56RUU1MzVwSFR0QVVK?= =?utf-8?B?RU40RjVBK1JORUhJOWorMWkvb2JwUVFKYmNBdHBMc0Y2Mnd2NFVheTVkc05z?= =?utf-8?B?MUhTMjA2QllrcnZ1ZWkyWjI4V2h4TVpVbXJ5Um1wenlFa1ZkeGdQUlV6Umsy?= =?utf-8?B?M0ZWRXkvendoSWdoaWhZWUFwbi9tdmNHUy84cFMxRHJ5MTFWalVwQUtEMHJy?= =?utf-8?B?eGJiU21ESVBlR3A5QytXaS9nc25XRWxWNVN3ektpTXV0bWQ1amJHRU5BNUdl?= =?utf-8?B?ejVhL2VpNFhQWkwwYnd4aWJNSUNCQXAySEk0dVNSWnI3cDMzc3BjRmNVNlA3?= =?utf-8?B?blJvK1MySEl3Rk9kRWo1b01aYm0rd0xxTndVVWMzcFdESWJ1a1hQd2R2RU1G?= =?utf-8?B?ZGZCblVkWVhkOVlZWFN1WGorUURIdUE4Wk9UZStoL2EyN1FNQ2FpSTJPcE4w?= =?utf-8?B?RkxycTBSbFFMa1ZNaWZETzlGaWNwVTZ5RXRWZFFvYjFGdUt3UmZGZWl1aUpP?= =?utf-8?B?M21RM3NFNjQ2c1V4WVY4TWt4dWozdFlBMzMvWWxqaGNBTzVDWU4zM3BjYU5y?= =?utf-8?B?T1BRQzYwQjg5NnZnVEdOWnpWL3NDZCtCaFN2eWdheitVNS81WXY1TGJROHRr?= =?utf-8?B?RTM1Q3VmdU9WeUUxdmg2L3VSaFNUWGZHVFUyRk9FMTlPWDZQK2pjNjlMTllD?= =?utf-8?B?bmsxSUZCOUt6Zy9WaE91YnBMK1hJdmxYaHBxY2lYTDdOUmdrL05WRkxzWkFr?= =?utf-8?B?Zk1teXM3YnlkUmVtUC9KTC81ZVlYZThKbnc4RlJQWGJIZTNxQVZtQmxUZnE4?= =?utf-8?B?SFZzS012amZMNkJseGo3dE5uRDVqS3RDeVNQSC92MmN6YUFId085UzAzQmJh?= =?utf-8?Q?HXZIGQCuNu8vKyNh5o=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: cfc24b00-dec8-4eef-a6d4-08dada9c6f38 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Dec 2022 10:51:04.5051 (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: AS8P250MB0188 Subject: Re: [FFmpeg-devel] [PATCH 1/5] avcodec/mjpegdec: Restrict AVID MJPEG to non-SMVJPEG 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 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: Andreas Rheinhardt: > AVID content is not supposed to be SMVJPEG; given that > both these codecs involve manipulating image dimensions > and cropping dimensions, it makes sense to restrict > the AVID codepaths to non-SMVJPEG codecs in order not > to have to think about what if SMVJPEG happens to > have a codec tag indicating AVID. > > Signed-off-by: Andreas Rheinhardt > --- > libavcodec/mjpegdec.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c > index 9b7465abe7..28e2839072 100644 > --- a/libavcodec/mjpegdec.c > +++ b/libavcodec/mjpegdec.c > @@ -452,7 +452,8 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s) > if (ret < 0) > return ret; > > - if ((s->avctx->codec_tag == MKTAG('A', 'V', 'R', 'n') || > + if (s->avctx->codec_id != AV_CODEC_ID_SMVJPEG && > + (s->avctx->codec_tag == MKTAG('A', 'V', 'R', 'n') || > s->avctx->codec_tag == MKTAG('A', 'V', 'D', 'J')) && > s->orig_height < height) > s->avctx->height = AV_CEIL_RSHIFT(s->orig_height, s->avctx->lowres); > @@ -2927,7 +2928,8 @@ the_end: > return ret; > } > } > - if ((avctx->codec_tag == MKTAG('A', 'V', 'R', 'n') || > + if (avctx->codec_id != AV_CODEC_ID_SMVJPEG && > + (avctx->codec_tag == MKTAG('A', 'V', 'R', 'n') || > avctx->codec_tag == MKTAG('A', 'V', 'D', 'J')) && > avctx->coded_height > s->orig_height) { > frame->height = AV_CEIL_RSHIFT(avctx->coded_height, avctx->lowres); Will apply this patchset tonight unless there are objections. - Andreas _______________________________________________ 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".