From patchwork Mon Jul 1 12:16:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 50252 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp1740212vqv; Mon, 1 Jul 2024 05:18:56 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWKaGaHlSLkY/tUIxWPi5NUNKzjnhFWuZRpFKt4zdH7OnYCuMMeZgFVbcVDLabXO4c+azHEIu7HG7LhZgnSb3B0m/00eXAjcxZuRA== X-Google-Smtp-Source: AGHT+IGe9T4oYUSkYVgaqG5WHZDcxCf3o+boKkptvJ7JfFDMKjSdrhok5QDWJdPW3oP7zZdh6yAu X-Received: by 2002:a2e:bd12:0:b0:2ee:6e94:632d with SMTP id 38308e7fff4ca-2ee6e94634bmr5343391fa.15.1719836336586; Mon, 01 Jul 2024 05:18:56 -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 38308e7fff4ca-2ee51583c4bsi19039331fa.608.2024.07.01.05.18.55; Mon, 01 Jul 2024 05:18:56 -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=jYlfTVJ8; 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 7206768D7B1; Mon, 1 Jul 2024 15:17:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02olkn2031.outbound.protection.outlook.com [40.92.50.31]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E269368D7E5 for ; Mon, 1 Jul 2024 15:17:44 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eWi4sCThpRnGwlZ92nOXuu2Z/G2pPme3UidAaub4fyRufm8M5Q6Of/VTwCWoqSNMrXMzeV2ZvyUUrMGLKiQTK2h+hs94sW8kQeArQAGuRgVNs4hP2y+w9bfQE1GYWj5XiG64jNFiiyY5ZzEg5kbz9cDGe7eWQNsgoR1S60AawwQsYiaL3daFJOwvFU/Fqp0zR+BM38Bn6YgEWhrJ4NhXJuYcZv4H6kVgiOt1xJVd+x0HJXjKLQhJKDu6PCsGHXBoJeBpdQdf/Q/AvFqgAW9Kl+C9u1UFwzOMiNij7/qArd4nAchKdoLL2lEV0OGfBjx7V5J6Xsq/85HUmWWKLUMWwQ== 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=OVa3eRVMODn0wCs4T4PaAqmlQTayD5OYcPbU04ipRHg=; b=X2Nyi3b6H4y18w1ix2bZfaST/rLY3LNLDZmGrelyLEKTnW/NWTrLDAyfG4yDM9HFgd1F7CKwpHkaP0md7sPWxgy9sWsQzCsIcDEuDgomA8IBj8nsA6lRLaRdumWyNFde2a7Otm/V2oD+PE4G4eiXR8rHWWdh3j4E6/8VPivb+SEJlu7GnANLOvkYy+PzASqBmeqD/RVxMuRLBEIaFSH3RawyhehIaVyaos6mLi/xMiAWIxaGhNHxydBgTGnINQzXzPEzzUcKNdbthgqdUrZ5ZeX88q+FoRFe5BqHv87y/tdSkaVp2TKiowvZWj46agEkggxkZUKOEnvgSvAvkCZKEA== 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=OVa3eRVMODn0wCs4T4PaAqmlQTayD5OYcPbU04ipRHg=; b=jYlfTVJ8X/fiv9I/k8crxiTn6Zlbm47wz8uV1I7oIb7+56WTSwWj7sz1ei8QIQsExAS6k19JrsK7NwLqNEqmW8vf2Qe3shGxVz8V8xQKvwipysyFEDF9p2Ta4oYXFfbRnMIPQB70CqsXnR/ymUewQXwNLSg+46Sq64RH/Qt+blspz0q3tvc4O9AzFUHiDehRkFiqRXa8Jcar5LrMC66W1o9Tn/V0BuWI3e/TMhoYPg0ZAGVNK2UBFiapo4aClhVBZW1sTEWToqDzkA8kR64g4u79wgXxIpgt8KBfTgDwEZjgl8iOjp08kn1ttLZWQro/vgUW/hmBbXKnupdhhebaRw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU0P250MB0481.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:349::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7719.32; Mon, 1 Jul 2024 12:17:37 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%5]) with mapi id 15.20.7719.029; Mon, 1 Jul 2024 12:17:37 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 1 Jul 2024 14:16:10 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [Pl7B1fUToRdkIkBse2+Q2muCtbrZRQ0/8Yobf4Xrrs4=] X-ClientProxiedBy: ZR0P278CA0149.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::11) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240701121610.3560848-12-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DU0P250MB0481:EE_ X-MS-Office365-Filtering-Correlation-Id: c5429d6b-7447-456d-7730-08dc99c7cbc3 X-Microsoft-Antispam: BCL:0; ARA:14566002|8060799006|461199028|440099028|3412199025|1710799026; X-Microsoft-Antispam-Message-Info: go2TpWzrv+JXxvA0xGMkGJBtAxA8rA7t0bV1atHLCuGa2OP+IupujJJ6O/Q7LynEHAQzS6I5NOcxoUBl2jrahWDwo+m4Sng8nbCWCELK/T8LGOslvxgK99Sj3M5bhVJcr8RZ/UkzkBjlT2kK8MwtrgZ/u6x9+TOnyuR3td8G1bSTB1eLxMPmm13bIi2bOXlOaLzBAP3xQ9QE0UY/7SKSOnyA8WW71U2jM021HTgkmv31IoPbzoRCpSAzrUOgxjW/w7K7BvCN87wlVqQtlXSvdl0HJs3uyk2S5tPfcnQtoazZmBQ0SMbT4EtqDjX6WfCh+VIQvb0fMOuKmYFGDBf+ZAqZ+MYak1xhYQfEbVkpVlhi9uQ6Ag3XothmskeDKZy4kFmlpyW0cuMUrLgOtQes6uidRYCH0Pqdvsf5RY41rdXz7SoCYGf2CYUI2XU1y3dR4OtKaSQyG53JHm8Ci7Z4KP8xSbU4f8IHjd+gIVLma7CbHLiuvxP58GWzuTSXQtJI1TlLesbAjdv6rkFE8E9ZoLq9YZB5vJXe/M+FfehgXb6lLAYrzJBg4I+MNbwTK+Cz5GCJHpEqKd/BqzIz+S9ilQK+rczrgu/GQGUt4xIcf/j4saOLD1ObYYM90csTLkmmATbVRIP5+vKwpS7JjGM7mA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: uwHM2WUsHJ0ZElB62CBrs1Z/bfTSUDFdnC7dAsB44xHGMTw+/5BFtyasqgoF5DMakjEuakt3I+GPkJtLtlY3oHAR5Fdi+Pbrt7kR9tDj3DFLBoJwf5EtwhOfDjcY5d9f7jtgPkK07gN/Q/ZvYen/U26KIbN/u/Ncm97LVGNZsDmcbMy+YN/vxSiP/kaK9HvNfIKphgP4zQ1ccxxmrrxt3CWMp045FPiqk/CRbOSnk2Xw9gQ1bwlrot5d951rPsYX+w0P5DTrHrCccJkLS4c9r8MY0M1IjTyWCfj9GVViFil7gO3SWi1a0EacSOnsRipU6Xh6bhXi4ZGq7NqZCeKRAeiuguvz/uIyXAvzLDmi6/0FU0pUAMwk0LlPlTVXM8ftPPErTk0aSKa6QcKj2JVco9qoxYZDFN+OVGB7Yu15EFepzpafhnB5V7z4KbwxTvBKfzOMnYSh3i8TYxwIJSKRZdL/HQh/wLZfKQnoNgv6nrtSUN2ScC3BaIQ4/GJMB1cJHFnghnad3G3DtfwQBa+j7qPNqa/aw1tO8BOeLmkfkiJjkx8FUUnJLXTsj0odxR6jlnry95wUylYSnS/nSZZ+fhjA5yuSffeCrI2sVnKtsu9BeeQFEYGh5A1fgrx9Sx9k5X0Cro48YZHiYaQUvMwxVRchQb4LpcCZytYtG1G44of7qSW2thoYILo3LPZSCWk8Lq6ukPQRkmRR9f3FlD1XM0h3OX2wMwRltkuQWJgUxdc2iQbeyy2iHzFAFZL7YL6saQ69MX9JEF5U4Jnm6aX/TNj2Woq9x5R+p88QqP9YAoQyaSFqUBIb4Nty5gqHYEWOSYEFT0Qg4YFpIwj8VW1v6Uhpaf3IVj88fEeik8U9OX/PDU4l69m2+lNK6XN/diL5JsjPPAj0O2MZVjbLgOowUsXLppYtf7wtA6W2aGB/BEV4JiuG27wjU1odjPF6Bn5YYdluKrgzQhYaALVIYJoWWj6AqSTKRsLos8kinc9y08GGMPwp74n/3y3x9c/OaQXy4xq/by3vc5UQes7UhKC/sKlWps/3dbTkRcSp4MlrT83J/93uoJLM1dNptvfdg0KTAFlof3eMZ1lwoMmGMo+K6DRY9WEfHaG/sN994COacvCIlAoQ/7EIFXjCmGffxdS5eDASg6NjYPeKGIlBBLzY1lN9eT1gCKxPdo+uvkfN26Q5twRJ9YZU+5vTKBmIlV09wQiqze6A07N8gTptyGRqBc6qTZ8rxBqrrb+3YjlKyztt4HNFNKqIxaMgCEapN50+CqdqKGiBCOGOPWMDi0MCyQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c5429d6b-7447-456d-7730-08dc99c7cbc3 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jul 2024 12:17:37.8020 (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: DU0P250MB0481 Subject: [FFmpeg-devel] [PATCH 13/13] avcodec/h261dec: Remove dead check 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: CRtDYYa/kHSe H.261 does not have non-reference frames. Signed-off-by: Andreas Rheinhardt --- libavcodec/h261dec.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c index cabca33c8d..50ac53167d 100644 --- a/libavcodec/h261dec.c +++ b/libavcodec/h261dec.c @@ -587,8 +587,7 @@ static int h261_decode_frame(AVCodecContext *avctx, AVFrame *pict, return ret; } - if ((avctx->skip_frame >= AVDISCARD_NONREF && s->pict_type == AV_PICTURE_TYPE_B) || - (avctx->skip_frame >= AVDISCARD_NONKEY && s->pict_type != AV_PICTURE_TYPE_I) || + if ((avctx->skip_frame >= AVDISCARD_NONKEY && s->pict_type != AV_PICTURE_TYPE_I) || avctx->skip_frame >= AVDISCARD_ALL) return buf_size;