From patchwork Tue Feb 27 21:13:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46593 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c51b:b0:19e:cdac:8cce with SMTP id gm27csp2255989pzb; Tue, 27 Feb 2024 13:12:11 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCU/0ZQd9+pW42cLk6CQao34FD1KRjj19u5GhwGGFusd+z8G6nd8sF1t6FCcuvTupw/vt9iS0PspGiwZEAF8LIzH00n/6U1vE52f7A== X-Google-Smtp-Source: AGHT+IF/iHZdAXobFykD4wLYscuVo+JWH8c7o978mtXwitGTCmBiNlCKKavssdxAzLp6Jy6aEoUR X-Received: by 2002:a2e:bc10:0:b0:2d2:b518:3ccd with SMTP id b16-20020a2ebc10000000b002d2b5183ccdmr572183ljf.11.1709068331278; Tue, 27 Feb 2024 13:12:11 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g20-20020aa7c594000000b0056452270979si987340edq.561.2024.02.27.13.12.10; Tue, 27 Feb 2024 13:12:11 -0800 (PST) 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=a1IxZapL; 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 4926968CE0F; Tue, 27 Feb 2024 23:12:07 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04olkn2072.outbound.protection.outlook.com [40.92.74.72]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2BE4768CBAD for ; Tue, 27 Feb 2024 23:12:01 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SESq3f/GeRZS8G0lzVA3zLxR11QaJXjGwp9x+FehXjGdFWgKabPxEDE3iQHkjJMc6Sa5UlCgNgsphcUSNowKih37RDVvsXL1IcwRzD8f4fPSCYHj7331dgaQWnZp6appWD190smGmSqE1gUXEZGC74mm1qIPOrk+AmGbYvdK4n1J6XW5HY1CIid1kT0nuH8almvhtDtq5mTLR7reRK0ebk524p7D+Ibdlcdah/skfuV8M+ZwgncIZrvZusFqUX8RDkIDXRous7BWlodkX+BrOIpVvkAN84Vs1duu/ZjQ3PrQujFwG1GaQW/gyk+V9gbdQ1+mtZc43YOzO2lBMKsZyg== 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=QL8MaXS4E1TdF0sGr9Zqc+UxpJZK87hoTUUTGmXCMow=; b=QAFAn+9YbliKg/51ajJtvgQAiMEfRhYmofEBpdNMDyvAx6GGXU7pSDjTk9PwTEs9uAKiSWEuk50VDdHb4871W0D9b7v0qwyPQxeryPZxu7WL4Kys9K9AUC350HVcCuuB/61bgSHq5J6oeJQ/dYln+Za7SGNhF/9jtHAmgEudYqG4KdydhteP1dHUAFLtJ6yVGLC266yidIuxPh5YRqKdVayKlYwY4Yzd1b+BZ0q4R3/CGrYzYruOZie1dMfdmcI0u5wD2UmSIqTgpLYm14mAcNabFX3l67cqhL6cVrTjLlRsch4XpYqhIIkl+E8SbREZz4NmbT2flwQCP+39K5Yqhg== 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=QL8MaXS4E1TdF0sGr9Zqc+UxpJZK87hoTUUTGmXCMow=; b=a1IxZapLzEZO2GG1V4vvLPRbCvfgNBtr92y3R1LqsBfFJgkcz4nt1W59pCjnJVjXM8GjGny9pYU7iWMT7vU38gIERiOgR2kJkIky6YL1Bl2tTkNF+Z0mtn4kt1nToSXVev8YzlwuRYDDI8tSruO2O0vQdnovvN8RxFQg2J0lMFyKL6YUfK6tD/lXQzx9vW3BFsvXK4+cuSGYavkx6v82jFCOPM7n//H4y94zwASzL0kZyNuHzHFqEphEOa04ATX+DzGrFGxT7Sjm5NrZ9QrOPIFLOcEXj2Kn4pqpEmchrU0AyPxolNAWoEQ5u+JJMHVLAfp/q5tanO+n5kbRR5OdQg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0097.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:170::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.33; Tue, 27 Feb 2024 21:11:57 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7316.023; Tue, 27 Feb 2024 21:11:57 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 27 Feb 2024 22:13:51 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [IjGzU4NA7A7PkCb2sD9DxJXLqnL7y54kalMP5AwgNLs=] X-ClientProxiedBy: ZR0P278CA0111.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::8) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240227211351.1774839-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0097:EE_ X-MS-Office365-Filtering-Correlation-Id: 5972b6b8-052b-48b5-c5cf-08dc37d8bb64 X-MS-Exchange-SLBlob-MailProps: quCBMN2EvO955NsdKUA6qkXzJO14pLp7lDiZJeRgDqFr2Dah48nd/BDOfOkU7KtsSa4kLL6QBuWw5Gk/K1KOSzMYhM63BO/GVEuNBE/UbsPtG2BJJlncyD2R1c7sIzGv474PItkjiyDosnV6poLbtYvghPXZo6eYvBYSJe0zmD5b7nAlpqOQB/gdH+jxKnwZpgCkrhFf0d/5GRgZmZvRDg9Ds/00yQQAI0OkjZ8j2Fg+fShrm70R2N0VeSzfIIEtlJkLo3hUQY+8hXGdFsjMww7y9nZzZ6w5QkDbCixol3vWI4xgbXVG8Vv41wnCadb7Fb72v318uNLkY49cUMcV311S3i8YskAiWZuD/utM3bv+jiFsq2QFsuzbRZZGyG6WyAMqAkjng6pi3SDQs9ulxXhyuQjNEfpSxAy6miBzGP/quIfu+5Un6uaw/VOxf7bkocsdhnKv1H/x1OwzkDAUsebSUySXZ5DJXnKA1tNA4uszFI7K+6mmJpihQ39g8oPneM8YlphOHz/a6T211VtdtwVEez4BFA3m4X8HUGe2kfWg7Cs2pIbKLBHWO0x53aKl2iGe9ULWES16eeY2NSWnNgSO2VDaH3FVPwyVOeEiijdEdbrSwgtEdJgwz5BO3s03C6KQcdkMwThBbmsq+zZlNGDMSVui/O56Kh+7ec1DdP1zOuLmU6/f1OdJ93TBktfN50l5IK47B1TO7UEhO6vxlw== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jZhRfs9VEo4P5WdI5AhIVUFjA3aa0E5cfP6HKOS2IbsohJuGECxoJJlcXoyjEFQ9sYDTckP42rWBbgibhQSDULfqjZfBSDP0ZUH1BbDzRfxhjnVJLLj2LaLBSJb4YvRZntef/suM8Moft23yeKk8uj/xmcwuHqx98CDnjxpnk8JgFrQMunn9+m5JGT4rMN9Lmw/Bos1UsJnjRxY/K/Lz7ImaKgLhQ2hElPxngTYJokVhKkk2v774laUgvRMoyd4CeIicLqawJ4r4b4raZfeiXYeQEpSgGCbkeu6EnUVLaKWQyWzMdLWBQKdimZJlyZlHZRwS7jXNkTmzWbapWUAOoWhKS1LvuWd/b/JytKnZ4uCkQsm1z8K6YORT3p67fpramtUeRNHMTAlRp6diAZwcX+Yl/AuDp3rQ4teMFc2ICInUkvL5ezziUVk9Lwa+1nL0rmK4KwxLhW4M6fbl3ymEaLEXZoOhJoLcueP7FsSxgSabUgZ8BO1AZu9yopOmv6MyF4RjYXBS8mristzErr1UYhdSiyicobjw3c5LreORJuMu5gCjrFpZHrNBBNLVHoyuatit0msin1Vo9oXl/jfk7jnJU/zOxK3rwi49Dmplb+07y2lqsNI8I4BW1C5LqThE X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: fUabDvuOCqjueG69yLoGb7tPVWJ2J+XL+G4feKD0S7pvNz+QGSyDa93T8HLm/FMGdeTHTwBrTSAqfpsDxhlsTtvk2+cAlcUr+9qfnfgfnnLvV+LWUUDLc9M8vfTnGvIsRhq7BxG8KB5eWwzo3Cqu80UqlVOQ+4KN2MATGzx3xkCZU2bBH1wltTz2wcpe3Zfc5PFCCDS/1hTBhQ2COHkB/+Niua0lPeBbZXXcsRfWvsy7fvTqtWsrvLfZ3Zbe3qlmL3m34GP1mK51xwtktJ5JgTsAiacu2ihRaC9avstdI77WxNTzKYTNERqsBID8oPBl50omkMfonRU3l3T8SUsj5tGYx6NNFZbNzBxiqmb1G/y1buJThgGzwXl8dOS3AjmDPC67FV7ON77E+U3EPHQ7jTAygqz4YLgxeXIVkGN7kr93I438ITqFSRjWB0lUi+Ai8XD2THXCa/MjuslzOGSnImdJd+mBYGHy7qsyYYCDZFVnnL91yic5lSx9gdA2HMhdzYjfZfmBN+CS2JG+MAR7g6MEPEWO51VvmU4j/Jv9030yUnBftISLr1C9p1y6qqpXAWhzh9exP+OUyMLtJv4PRuBoNgFUKtgiU96LbK1ZWf+YNcXPgZ/jlyxA4VXn3EcDAlyrDO4Inx0QF4VUYi52rxPKFqeqSFb9bR1FAOz3nFYt14eu61pF0433/TvYuEAeUTpeP5oKm5OBLofRgSQe4j9c0fjb1tr0uADHwDFhh8zrZaN9cPJrtHHT3wgo3C3//Id7WXwagWRDMtG/fEnKBCawhHb+FVs5zN7wUBqU3grms/0Mvarve/M8mJN9PZMLRHvfA/HgkkprBCsnf0tRwbrKBTMayiI8++IVr4BDZW6Q2R6iiy8AAQtX8VNcxmPQcQ5t2OUv9DKtDXJoecSKTLWXAy22usF1RMiEUFPqCo2iFdj9EDJvzFUmk/ANHlHmjYkbzm0W7dV2CbkVkpnFNpI8dsVIsbvVcPonlipnX9mA8s1Iho9RHzq0EFJSzN0+S8HJxmJ3o2ZYXhHmzFKHqxCf1fIP5gYIW4iWj1RlbpuYeF7f2CHQ0BZadG8qdOybCshE+XlQsa/L3dnRVG8gq6AWllNY/VMpeYG3CtZ7uk5BI1JUvloGOJ6lkp7CnByrCoPlrtBi94ZytwftojFGQJTQx488jijsN9nMKiRQzoRsFojFKP5hPqJDUfttBTTlSv/wBn1zWZ1q3M9GzrqmQAoMH85RX5AhB7o1mjlqRLwXxAjT+45LidqRbcaM195VkGzx2aW/AaC2Xr01xhAKtg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5972b6b8-052b-48b5-c5cf-08dc37d8bb64 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2024 21:11:57.8463 (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: PR3P250MB0097 Subject: [FFmpeg-devel] [PATCH] avcodec/decode: Improve validity check a bit 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: +6XqxvBD58kF Signed-off-by: Andreas Rheinhardt --- libavcodec/decode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index da6446d879..7c67b18bc4 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -977,8 +977,8 @@ int avcodec_decode_subtitle2(AVCodecContext *avctx, AVSubtitle *sub, } if (!avctx->codec) return AVERROR(EINVAL); - if (avctx->codec->type != AVMEDIA_TYPE_SUBTITLE) { - av_log(avctx, AV_LOG_ERROR, "Invalid media type for subtitles\n"); + if (ffcodec(avctx->codec)->cb_type != FF_CODEC_CB_TYPE_DECODE_SUB) { + av_log(avctx, AV_LOG_ERROR, "Codec not subtitle decoder\n"); return AVERROR(EINVAL); }