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 92B2B48ADC for ; Tue, 2 Jan 2024 02:52:22 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BD0F768CB32; Tue, 2 Jan 2024 04:52:19 +0200 (EET) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2044.outbound.protection.outlook.com [40.92.89.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6ACC468C8C4 for ; Tue, 2 Jan 2024 04:52:13 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ekOkY228ZL5TFkbzWwDnTs1LAOYDyNWHTy1l6ULr7xcW3NWr22RM1qscYdNYKaVw/fQjj0nZaaAc6mjSufXXOhki0ZrbwMhLfH6T82/EkLENTQd6ff844X9L8wWZpmTXa255XhiFcvDf7qHDVj4HjV61ueKUQBr9grp0sYFqb/Nx8tcm7YbCWczrRRQXzh8fM9NTVELzA+Xj8nmglUrq3p7PWjUI2kB0T5Dknp0EwAotSgxRG1t50JogR5xJCbjWnrRt/tH/BAkMnrsG8esh/a1Tqjs5SArhd1FIuj14ntk9X098/dYizOF86RAz/2MxXYCeLfo3wR4U8OyA8M2fMg== 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=kUQDHOYaygj4wnWslp+kgSLWwu4pmw1o00swUkGfFfc=; b=apsSJY8uPuxDpL27eeEm0d48t01wXiedF4bFv4odzT59qiSaFDKj89Wr7aD+kB8Rv5+nZhdLZCjFfQV//PWzqsyjo2ks66Yj7NBv3lNh6PP4XUlRdDItAm5qUko0cPhJIiheNAHUM7h6j/6LrQcRdlSfoT/NwgGleFet+cOXdYbsmIrm6tFVvaYtP4hViCSrnc422t3o3lGFozLzvUGELhSfesFuSQKQOlOzwagWE8qoCv2vL+cXBCPqlDWW9kh4Day8f8vzoAKqZHqmkvq/bAyZVjhXwxKyc8jkeHCDxiMWal//P4+C4kdUXMCbwEgH4POL98WcrEW5W/a3rr2GDQ== 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=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=kUQDHOYaygj4wnWslp+kgSLWwu4pmw1o00swUkGfFfc=; b=VWhgt8E6B8craMOtiTWUsaFw2WRHm/Q4dYNRq9HIBAogim//frjB1uqVLRUzm5+6aIp34wkE8dcd1hPG1h4/WtGn7t8ZTLeDeRNN9KpdqG+fX/dTF7OuxDZ4+FwqI0OqXEC/wkr6BEpRp/Uy4UkwiN6PVJPP+2iKZTNWQ5AIRxrDFuQ9VILJfX/z0NgH+A++W7kG68nRwZEH2cgd8V/0A2HaSBErJo7jEL4ATB84Jw8cl60uPQnJF5dKFARGwm4pY0whbNc0uVjgLr/FKomhy0JSgi+bQWTDKJRr+v0ndTC05oOmQsN+U4JoyxqiYuF4Yawa/dtw20wKGJceDTp8yA== Received: from PAVPR08MB9795.eurprd08.prod.outlook.com (2603:10a6:102:31f::12) by PAWPR08MB8886.eurprd08.prod.outlook.com (2603:10a6:102:33a::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7135.25; Tue, 2 Jan 2024 02:52:11 +0000 Received: from PAVPR08MB9795.eurprd08.prod.outlook.com ([fe80::83f1:da95:eae9:6b96]) by PAVPR08MB9795.eurprd08.prod.outlook.com ([fe80::83f1:da95:eae9:6b96%7]) with mapi id 15.20.7135.023; Tue, 2 Jan 2024 02:52:11 +0000 From: aybe aybe To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH 2/4] avformat/psxstr: fix demuxing I/O error at EOF Thread-Index: AQHaPSavhDa/TqmGVEeOzyUZ/pwY+A== Date: Tue, 2 Jan 2024 02:52:11 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [MVM/2CD4wcSzfhb3VCZKpGdy2Vle0dHB6mo6fMExIacjE9wDnJkxDy+/9Th5JROu] x-ms-publictraffictype: Email x-ms-traffictypediagnostic: PAVPR08MB9795:EE_|PAWPR08MB8886:EE_ x-ms-office365-filtering-correlation-id: 9bd364dd-cdf7-4e7c-c0a1-08dc0b3dd193 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: oTxuHTD07r7YmxsiLQ99WlP2wYC/hdB1HLoO4wgFipOpcUtPUf9pMMe6uoB6YT0PRh3KRiUrzdgRaK5DnBMuL1GYaKJjPsHeewKcyr1WMtAfojsy3HM3geIv7BZvuEVd4vHVx86oiraLjv1zTM5E2w+lJ6JxKuvc/P95O5KZt4Rie2G5FRI3v3JNH1PWQe0phdpLHiBzb5rh3p6e9nIf3GfNUg9jouhImnhdWXE/YCVqCp5XHJUMQEp9wbrDv31kByCTb8YfU0YJq5Ppgb3iuB0crf1vx/W+utIUAD5tIsDLHGy0ICzxNtRWvHgzK/nm4wO50qdz6EVNfIX7zEXIp123RCyxf4hD3X8VM+ps6I/MrKgGpc3Qyhct1mEpVDIXbvjn8qFotmRWaUpux/1aLgVozgNoWiOYicHG9sdxICyOKRUO2+vClmZPH9uXA3SfQLs31N4gkKIZx+UwP334C8BqiyG5enMnc6DsIrHt8+Mho14V7dHi5y/bsSpJKHJOcePRoG1695+y3ZR155oPtSI7yPLw33uPBQ+YtvRWO42l2M0p3UaEWIFQ3gA2iQyn x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?dmliOGZrUlJZTnhiMnd6Vm1KRFYvTnYveDNLK0FKYjVISDZRL0MwL1pUTlY4?= =?utf-8?B?cHVYZTkyMURxRTlxVXNiYnBxVjF4YmdKU2psaVl0TkZ0YXZaTEYxZ1hPVU5X?= =?utf-8?B?bHlsUkFaRzc4Qk93ZkhEb0xkN2VkL0d4cXJLMTVDRGQwV0NGRkk1YitvYUgz?= =?utf-8?B?OE5ndXRyNVlyL1QrQkRibGJRNHpVMHNCQ1VRdjB2SGhRUGZFMGxrNi9hcDZF?= =?utf-8?B?MmhQNDNEU1UzVzkweTM3NHRrOFRQYmNTVHMrS0FIckZmWTcydzE5Y1FFNy9V?= =?utf-8?B?ZHV2a0tYOTNxb0NsbHNwK3NxUU5NblFvMzFrMkVhK3pzZEM3TmNQb0Nkdzdm?= =?utf-8?B?NElXZExQSXdUMVlmWjZxc0kwZWRoUmIyU0wwbFg0dExIKzc4V2pENnFaempW?= =?utf-8?B?bUZFY2c3a3ROL1NZdUF2QWgzbFhNc1RBN1JYM1VURFRid2VyNTNYWWRBZjFz?= =?utf-8?B?dmMvSnM1R2pheVBocVRNU3A5eDhLZUFiWGdQUHZjdEdjc0pHYTY4MUthRGJW?= =?utf-8?B?dEVadmlMWTlsclpKb3JPcE4vaENxL05VQ0ZERXdNYllYTFUxVldmcUpQTjNl?= =?utf-8?B?d3FXYTRMZ2x6NkZIeVprV1UySmQrcXcwaVFoeEFQNTdOcnd3MXk4YWlNMUpS?= =?utf-8?B?RlZkUzlzbFBRY1lZYXJCdVYwQkROUC91QkNSREpCbVMvbDJxNDY2ZW45dStz?= =?utf-8?B?OUJycjZmTjB5RkF2bFRGeGxhT001WXVoRTJCbWFVT3BlNE9TZTljUHM2Uktq?= =?utf-8?B?Q3BnSk1La3pyVnI3TVQ4RXNJMEVzOXFHanc0K1drdHJyMEY2KytpMnVhTTNN?= =?utf-8?B?L3BVbjFRTTR2TGd5d0RBcjZsSFltL1d3RnFnTm9YTUx5NjhiYllKcWRxeDZ5?= =?utf-8?B?Z2ROdDc3c2VsQ0RDcU1EaktIalEwMElYMytiakNuUWwvc2NWbmRjbmtmcldK?= =?utf-8?B?b05PNk0zTllwdGpSeUV2L2htTGlnSk9FNzB1RVk4dk5DbU4xWDZuaG9sYksy?= =?utf-8?B?OStvK0pBN3FXQXFxclkwOFJKb3EvK0F4T0g3cUFxT2RDMDJSeCtnUjNyOTQr?= =?utf-8?B?a2NISE50bEgvYUtlb0xjUnFwWVorVFYwSEtHT1FTY2VWaDBteGt5MWhnSlZq?= =?utf-8?B?L3FNUXNHaXZ0bHcvYklIYUpGS2hnSGNCaTVtd3dXUW81RWIvNDhaZzRjaFJR?= =?utf-8?B?YWFVV2xENmdIWmhLam56SVQrTzQ1endHTlk2cktKekVNNUxvcXA5VjFHM2Nn?= =?utf-8?B?RllZRkVlMzN2aFFVanlybDl1VWFrQUlrU1g5NUpPUUJJckRJMnA5WkFjbEpF?= =?utf-8?B?RmI2VEJ4elVKcDhVaWNoRC9FSm9BK2NwR3IybURJdXRkcnZURnoreG9iaFBy?= =?utf-8?B?TmFCTzFvNG9rL3hCSENlUHoyWk5OYUQzWm56ZUJVWFRwd0lwUzVZaE41L2Jn?= =?utf-8?B?S0VvTXRkS3ozWGFvbjlqM0tyK0IxYTNIRENIaHlBTk9LelBvWjlnN0hUcXIx?= =?utf-8?B?Ulp1ZWllRUNMcCs0R0oxUWxiSGJjeEhoUlRBTzEzTFZpeGlKL2pmTnFYYjds?= =?utf-8?B?NzJLb2FEazFCU2RyWFNwTnd3OWFPdWhzRWRKWlBNS0Z1UVJyVEQwanoxK01U?= =?utf-8?B?M3BrL1dEVngvOThRdmhkOUFPM3Q0R3BwVys4RVNrYVdvZis2WStZZVBrNEt0?= =?utf-8?B?d1VmekNUYWZWaVFaMGZTbkV5eWIxSTB5MWNvRWc0b1JpSS9qckdpU1lBPT0=?= Content-ID: MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-83b42.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: PAVPR08MB9795.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 9bd364dd-cdf7-4e7c-c0a1-08dc0b3dd193 X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Jan 2024 02:52:11.6271 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAWPR08MB8886 Subject: [FFmpeg-devel] [PATCH 2/4] avformat/psxstr: fix demuxing I/O error at EOF 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: This second patch fixes the following error at the end of a .STR stream conversion: [in#0/psxstr @ 0000000000681e80] Error during demuxing: I/O error It's been a bit of trial and error as I've never used ffmpeg, but returning AVERROR_EOF appears to be the way to go (doesn't complain anymore). Signed-off-by: aybe --- libavformat/psxstr.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavformat/psxstr.c b/libavformat/psxstr.c index bb56b05688..72d14b9792 100644 --- a/libavformat/psxstr.c +++ b/libavformat/psxstr.c @@ -165,8 +165,12 @@ static int str_read_packet(AVFormatContext *s, AVStream *st; while (1) { + int read = avio_read(pb, sector, RAW_CD_SECTOR_SIZE); - if (avio_read(pb, sector, RAW_CD_SECTOR_SIZE) != RAW_CD_SECTOR_SIZE) + if (read == AVERROR_EOF) + return AVERROR_EOF; + + if (read != RAW_CD_SECTOR_SIZE) return AVERROR(EIO); channel = sector[0x11]; -- 2.41.0.windows.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".