From patchwork Sat Feb 19 15:08:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34410 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp1888270nkx; Sat, 19 Feb 2022 07:08:45 -0800 (PST) X-Google-Smtp-Source: ABdhPJwOeAa7eqoqk7RGG88UoTijLkQyPN87z9g33hVfD2GIH0kXRdKC3zNWJo+4t5oqpsEYGTvV X-Received: by 2002:a50:cc46:0:b0:410:9fb6:d1e9 with SMTP id n6-20020a50cc46000000b004109fb6d1e9mr13344998edi.118.1645283325539; Sat, 19 Feb 2022 07:08:45 -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 ly13si515079ejb.735.2022.02.19.07.08.44; Sat, 19 Feb 2022 07:08:45 -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=MqEntMqU; 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 1CBB168B17D; Sat, 19 Feb 2022 17:08:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2106.outbound.protection.outlook.com [40.92.89.106]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E674D68A8C7 for ; Sat, 19 Feb 2022 17:08:32 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UIXkzoqnKG2Hiu3vBrmKfeP5EAix7gMfKFVDTIqq0a1u2Voy0rZnNAoFsOEJq8jQbe5mKN5RbngdQpRDzmwfYreSnG4gMNA5SqJ7X8mu84hK92jxlaXfhc5jASsPHJYoozW/JEF3BlH4e5CjaZOhpNPQYH4kZtWPd7uLjCisGNje5q0CR+onB6RbVXQq3TAJrnO/902SD2BIB74LnrEJIs517sAlmCEBpe5PGfCym8nXQfjV9/dL6jpnZsZPVXzxgaIyW9A2dJE9UM2FCjdu4fxt8GeAjZuCMt2WKNJ4aTUSWs3ywx9vrjdnR4YAvw4MdL1w8QbkXBMq6IhkCHJFXQ== 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=UsJRXOwCEDsCjH1jyvreoXRN57N7y6v0EbZOi0bBy38=; b=djSp4WfOHI7cImWIKkJeKW2vyelfoaX0iRS2CQJsvam/NqNwtOLO6QSrsBW++AzlD1MpWlNA55+Q3QOtlkH3x646utvDD9DT9T3VL+zXJCyAP5bysOJYvR0uouPTuhyOiBGNMpgIMIS3O3yjv3MAPj02/LIxlzcF2lGAD6ka7mNlwHh0OUQYOlOD5h0g/d2vMRFi2rg11Ctz3aJyuEA4i6kXBEZWKwLVYOU3Mr2g96KtcuxUkkZWxJF8Mv311PtOevNnwslBrMBgQfhazxYJDPxocDH2WIJYxVEJDnFFSz7uvy0G+oo+iV+Wv8Pm/Q9eNxNrH2PtCgm140d8Yb7CDg== 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=UsJRXOwCEDsCjH1jyvreoXRN57N7y6v0EbZOi0bBy38=; b=MqEntMqUPBkvCHbBGWKioMf5Ha6N9vG8NV0uDlzfcmkiwxrmpkFYMUrVDH0YwPBhrO9Lig3Tlo3/Pksl5C9G7/8R10BHl7uVuQLF6Pj65uBrjH4I7GvGci2tPXiKtl1sYKzdkjHkX8mqrBXKdTYDOqRkczbUMTLzXLOMtl57SXmfB5/AtlPEX5RbHb+VFbL2W/odXAx5+JEAt5PQfZCQYuFe4kgVEk9Xm4335kJIWl3ag0UTlz0f8hYgUURufyD+z88n62BrRaSULwWs4Wbn4aqziKmRaozNBPvoVZuGHPogFrTGcBqu170vsLT/5tDMBwlFCPLEmT9blf2juapA7Q== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by DB7PR03MB4732.eurprd03.prod.outlook.com (2603:10a6:10:1d::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.24; Sat, 19 Feb 2022 15:08:30 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::b8d3:effd:9a3c:4090]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::b8d3:effd:9a3c:4090%4]) with mapi id 15.20.4995.024; Sat, 19 Feb 2022 15:08:30 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 19 Feb 2022 16:08:20 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [mf8Y/o7M0KKH6iNbN8JLxtGVcAMS4ON3] X-ClientProxiedBy: AS8PR04CA0005.eurprd04.prod.outlook.com (2603:10a6:20b:310::10) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220219150821.112274-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 27c2955d-0ea4-4a2b-9f29-08d9f3b9afee X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQoZvRT+yV5S6kLnUwSxjrXvily2/0WXbvYLD5XfvFlm5V5Tt4IpPFNNINOSnJMRqFtEhZTfxM/gfmSr4vsVjatuAonTPJgTeLqEK32THSwgzpCi3Y9aSVxYYqvP1UuJTtUnL3Th5Yi4Cg0RLTlwqWGnuGl6126sNU+CNjuBI6AAF1sZhIqoS7PKwxmkoFTb0Tny/vfj2gWHbPd3JGe6vnRvEurg4nla/o0TB6Dh3gsk5mszizMvXo2DqnDMaXSKjZSr45A/WuRn8rM8DYbHvpMrWYIaVT57DgICLUt6ncFukl0sBbE6hGKhhnFai+/XJ4/uMjILyFle3U6tPSqstXhlj0lxRNO61COlih8nyUAnjCFv9Wy2QGvSNhPS2am1FJ5O6WLUSdnvBp9NFfhA6wE5B8HziA/6vdFXOdqJw91zjFi+TuB0HXQ0azOeJpJaC1byJc42msykucC1+3iF6/71hNEv5kAjPovET+2pp/v/CejJ71eIaPbLf3fopSeURMA9Gua3nC6tcBbjFF+DKT53depue3ubsv1ZafvkeC7fBGwKzWuj4Tcbmh8aBiR7y2bi15eh4OL1o+azQEZxnYn4D0wN3TT0zHSnrrSlx9cfUNdWHwsqNI6+aDc7ypKrmglQzhbwFgsTaHBTXL8w/mNnjN6PkFtBGh1iFuI6AlbTzTGwGLEtLXZdpzlDifynyYhY82KyE80Jv2Iu2HDBlhu7YxLO0ktw7eJteVjsQZAQhv/pSYVm1BUG89aeqYjPcI= X-MS-TrafficTypeDiagnostic: DB7PR03MB4732:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: s+NDyNRlbm62SMAnj53CKYm/94eGrjdEjzTXGqxReP9Qx2i1W4KAxHDB+kAMYqOfTh5JcLroikFyk2GN3230A+PTwJDRxc0UBP1/f88qlxB8YuWIkmF+WCGjVMwvOBq5ulD6N4fpkKbwWZiy74GgGFzCDLsfZ5n0QQgD1f8m1VLP/DCSjFj6qH2+gcebgxzGzNlf3rIEXngcOFwCqVBmkrFnJ4a6UFqXwaYkpFqac7x7gorgyvv3hsVbgVqiW9ZSfLd7Nzj7WcSJKD/FFbBXtU83ngX6rPLPemEiO7CvK0Nd+39XczoCUi7kSXY5r/aWdm3KfDW93sLXtkDwp82pbnnx7TTwsgG2uHUdSB5Zp//EIJqBUaqFbo2vv0t4TLcM3dp2RoruvWxTMrtBQhbZu/e0RwvZuBgzjMIKWicWnBouJ2uEv45ws0D3awddQuOGL+OR0+pXPnRYHEmdg7vDpoRw5TUlalxEorkCRK76vL4yTRSeS2pJ2XMSPNiDYs4fAeifH4KDccAJQ46nV8PL8/EYwCjPEnk6qEga5SbU4ULcE0SDc0Im4Fqd+vU/sbY3WfYpluXEAfywT2bci2Ui+Q== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Zonb6KsbuCOehbN6ELGqhzmgkBkBfiePbwiFW3qBY7rV+7idJc5swNyU2R91Q7MUnsEJMkCvD2Jjvf/WoxdCFtAc6gntRPdd/k3SkD5lVgnIo+myx/JRp6GexTvUkCYC9KexI8ah7YL5HdkUhoNXJIdtjiTbdqkCt76qqTYwU3vAbtpJwYrCwPT2UQUhlGsMkY38wAqMZ8HPS8CkuFDb4KxFk26Xw1D5lOdpz5m9UqSM7ZXv7wGMO6BHzvWCvKb/KLPZIUBmZVXKA9hHubEeQSTseNalOt6VEphT0H/M4R9CdaFXnFD2jx650JoHDuURblLhZatntU9X2Nm3n8EoYvpus5nLpH3vgPdHqaA7vTyjhYh2nB1PmuDgypn4318xqJVfN4XkVrYn5fEJG33NuAJ8lC2fg1AuIepkWRRk58Jfs6EB2aYhyyF0GW1cU8OObCMbolS23/BRVe3BnJ6JezmNVgHJd2ZiCWXMF+zFpmG9KQBTXJIVhgM4DX0lqBNM//5ID6ggFJmUBbFJf+Wh3AjmBXqKCWAYfdPsijKB+yCbhwlKcjvPa/dysYj/4I4a+YCTiWxx/vljlXWWCpIYAeJBB3AcXpMQ0AZ97wqIqCXYVLx6RqNoFasYMgB3FPP//mzuAfvsi78FL84qnDsrqL11BzbFuamNgMfZdnlJo/jtKfoboAstfIx60J3xO1w2zdboT3x3x0UezQNM34Cf8BQM6TnPwlfw4e8twV06stE+nI4OHEZFI437oRg2YvOB+5cwot2B+R/+ASzrwDfMMd4LTxpTvdgkjKg+y2tQuYiNlvfjQnPE5LeihiiFFBKrizWbxtlIry9py1SWsKH6yDkhKvE4DvxxGrq5flDiZSuhIw/5B62NWpuA6146zt7E77cm8i27al2R4r6Mhhhd2EvZ6ujfXzWl+nYCBeR8AzCoOQeo/zNdyR+FISgfyfVYMYmyXXnD+s/RLvlxlPKiMw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 27c2955d-0ea4-4a2b-9f29-08d9f3b9afee X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Feb 2022 15:08:29.9379 (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: DB7PR03MB4732 Subject: [FFmpeg-devel] [PATCH 1/2] fftools/ffprobe: Flush decoder after draining 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: IPoKF2p/jyRy This is a prerequisite to continue using the decoder at all to decode the next interval (if any). This fixes a regression introduced in commit 2a88ebd096f3c748a2d99ed1b60b22879b3c567c and reported in ticket #8657. Signed-off-by: Andreas Rheinhardt --- I wonder whether it would not be simpler to let users reuse a decoder after draining simply by sending new packets (without flushing). fftools/ffprobe.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index 8a8e3de540..4205ddedda 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -2730,8 +2730,11 @@ static int read_interval_packets(WriterContext *w, InputFile *ifile, //Flush remaining frames that are cached in the decoder for (i = 0; i < fmt_ctx->nb_streams; i++) { pkt->stream_index = i; - if (do_read_frames) + if (do_read_frames) { while (process_frame(w, ifile, frame, pkt, &(int){1}) > 0); + if (ifile->streams[i].dec_ctx) + avcodec_flush_buffers(ifile->streams[i].dec_ctx); + } } end: From patchwork Sat Feb 19 15:09:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34411 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp1888926nkx; Sat, 19 Feb 2022 07:09:34 -0800 (PST) X-Google-Smtp-Source: ABdhPJxoj7qfHkGcghHmGA8N2EL8KkmmNvgm+t1B14R4fMbPkeuPt6vZFLaUmaLqxaiU+c3GuFcr X-Received: by 2002:a50:ee14:0:b0:410:7a88:4b0c with SMTP id g20-20020a50ee14000000b004107a884b0cmr13093656eds.37.1645283373821; Sat, 19 Feb 2022 07:09:33 -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 e2si6761280ejs.226.2022.02.19.07.09.32; Sat, 19 Feb 2022 07:09:33 -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=JJkN6fmj; 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 41FAC68B1E2; Sat, 19 Feb 2022 17:09:30 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2064.outbound.protection.outlook.com [40.92.89.64]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9241D68A8C7 for ; Sat, 19 Feb 2022 17:09:24 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EdYE+4DQBuvnThHaVmDzxvt51klXgnHPgdAIbfFNbi42X6odU7HA5qa+x5bR7O3pQ+OU1d5g8eNKvsJqJGLKhDW9tDic8SFaVb/4uPbTq0ydnUuQG61fTdh0LahGVBzF0xI2GdZRiirxdRzq8l/q/Jv1QIS4SSkMCpZzjBAF2B+NAWr1O57JA9rdcpiJm1WbTMWy5Yx8GRL+2+l0EOojITQ9ToJXCAWq9k2STw+2tJ69q9N0nvf/DOJVHZdqlrHxMTwO52tt92n0GjRjT8pF62CNPYb2+hEz6fPwfXv23pf0Zec0DGUcRXFOOykF7PwjT2zKUrRyXNdqS7c10QOpnQ== 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=ip2bymv+AqRZRmZskUDqL9p02yzpQvCBycHav3XIy78=; b=OPRDRU7Qm+NuQmM1jMs39H3Z4yPc1hrM+HwQPc7OKpWkdPGz5KAYXddzWYxBxE/ceJbADpXrFMJEESK8qPozWbu2axrESfeqWTUHExhLLlc6y+koeKmih5E6AOycfou4huR3IvUwDsIlTlzbIUUq1uGnadRN/BjjCHRYh/z8HjCfdRWkIFjtAO8TtiTkyLPjHPeAo8+ZUl7XEHk/pbwmvtiVZkyTCyVzw71eK6X/vUyFK/+39v42Bmu24EMZL4whET4/g9hk/RtPVWRin5bc1caw7+hrVyVeLSZY0aTeXqBFKi9S7TR43k0ap/RAMHdK8DOT0DJ3asfT0tOAKxQRkw== 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=ip2bymv+AqRZRmZskUDqL9p02yzpQvCBycHav3XIy78=; b=JJkN6fmjCSz2AujN7CsHq7HYsthX4iIxDwJvASHxAVwEriSkXwuKGjrRk+0nYhW70gbmS5pCNYMbYvVMaR59aAvaX8us9cosbNfVq2aWyIR+5cGZL67gT+JiIKXlmP+MI3jCtzoKEBU48mEEBgR0Vcyty/Ua1YGh8yhvt5Fm2FuPo8tfE8GRpQTwrF+cBh83WEPleDD6Tdfg0fp5s+yZEUMHtdybO/GgZEgZoqf4JKzL2PbBIEt+n62kME+0UNty2RjJiFVEveWh/ET6ATjbiIsmONYZjvM946UMbei4klB8sbyp/hX5PfktHaf8laLJ59/9cnoKk1UeYWyBnJ00xw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by DB7PR03MB4732.eurprd03.prod.outlook.com (2603:10a6:10:1d::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.24; Sat, 19 Feb 2022 15:09:23 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::b8d3:effd:9a3c:4090]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::b8d3:effd:9a3c:4090%4]) with mapi id 15.20.4995.024; Sat, 19 Feb 2022 15:09:23 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 19 Feb 2022 16:09:16 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [OW6p+QVBA8dYAFh2v0cTRoOz6wGwDOpT] X-ClientProxiedBy: AS8PR05CA0027.eurprd05.prod.outlook.com (2603:10a6:20b:311::32) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220219150916.112418-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e5cba77f-25a6-4c49-ce7f-08d9f3b9cfbf X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UJSyAjaCpvSpDmbHMH6ZfTvbF0tN6g6IS+eMc44Bg/aOd1v0N4vuJnXW6C1BF5yEHmgzhTZtGX+APULIwpmOILXN4X4F1cS+yKofOvLl7LWBZXy0CxptBF+T9PJndvhjUSp/b0sf7v9WIcb6XDHZh39emcZ1pyBJQRQQFKnOVERg99nlJIOp4eHbL1/qwpieKTZNBIZGQXdfcQtQ9TotlK2j8ehyiTGuI16MYN0DPUlXKWDn0+bIflkewzp3hQ/cBhFxIlW5tygND57B55vhVerDqBOt/8NOC6YI7j4xhS9d5DQC5AM/H9jO4/LfQ/NMJjWrnRTjSJl0HrS6TzMv6P4G0bUa52MGkJpnJNC6iV+0f9CrFFu6J2K30GsP+EjSp4yHVKsQePhjtMIRiZ8tAyWuVZSkN1b+wCvmr0jRZxX8lbgnZCiVV6fPp0C2i7pD4snfTILRrrbykF+TXc0szR51lseSfdH/kW+OpxaMDGPTwYqBH2TwN/3MjvAkwjyiED7a2y0K4Zrn17cSQNs+WuO/Oh6L//VOs8EnSJB+8oe36bC+eHohB/oegnY6UkVW3laM7EFgfQPmn2/cfM32IhmAHLVTCseRipSMkqFbtyIsIKKNlv1YPlUSV8dMNFxSXspFyDEGiMhdQGMX4XAruu2mfw4ZggnaXXIK3uSymT5K8oDkuIzd12SLwZ49NOqP3CN6403l/R6Ug== X-MS-TrafficTypeDiagnostic: DB7PR03MB4732:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QgZNUmoKR34uYXY+EwTiIfYMesIb2rMhbGIbWGBXU5otyInFzLPNR3fq6oNIsncSsUc8Ot2hXDvyS/06A6jFT2encl8jCGv7M9VXrqJNULwmGvbIVRdreVztQNV7LX57K3Yk3pFdkQPsmqYOBexPAV1UfApXApXbrz1RpsqKM++Gf281SvpqOQyDIo5lSVdqPzvFYBeddS84WgY0vK9GjjKbGSXSiwxAYWB4cHTLlHlQnD7exSORSGSwl4lvDF30N+zuoxz+xxU/2NgHuO94EsbvpIiffMU232fiwAY2Nz7T0AeXIlM3mN3kX+HTWz+1Zq741NH33cqr+qJpTHuhObyBBkDohE+28HLQZT9ZoFNlWE1hAek7KJHPZffKDwuDkTlwUcs9X6CZEqSjGakF7Gsjc8rr/6yhmuVO8tGs+ajQDiCcvFj1IJhgQZ4EHSxwyx/oGv6yLEWl5r4clzc0TK2V0Q1p7unw6xnYTWuPQhk4/Zv3pmHk+Dhk82ev7MDJpXEHNQKoMamE9AbIfv1MvK5pbiYWF9DMnVnvr2GQ7MeSu+0nulHsMu+7IxMzJLlZqLLMjnrtM+G1gTEFwiWFWg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Ah45eBUtnBs1gJfQWrFzgVkM2E+B+WPC6WZjuOCc7FmpHyM7YzQT6wvSfk+evNXXETxfiJo/w2o7OzA8wTzH2sRcnr9DoJUNvDxO1/Hc+4vw4x7HiEkXTmvpLUOBjWzNRzYRliCSUnGK43D/Sm76GGjOV1CujhduODhDFXnPk4C2qBSh3zx0KiX1aweFAPPV1Guha/hPZ3rexsNbmquEmddss6ydm0q+aTMNXD2RqMXWgaW2QkskvF9O80W3B/jDy9uVp1hZR/lKAsVrKS9BGLYaty5DQ06xyoj22KDJX2WTuh3MRtJCjPyf10ABMUR8DQ5DOyBM24jGHND40oU777A8DqWIeLnANlTcwDYsLbYagv0oKyRQlkVzpgaROEjuOefMqdRCkSbszDULwrWiPD8otb+YbWKJAD/6m7HUIvCrKNiQxpddR3upd0LelNEXPwCal3HmJT2AMh4QNMjGrqL/AUdpov+UyqaujReKogcGkxdFok4mwWcCUBofYc3Am/YZILXRBd01tfCODImWoilH+3BfG4p6liU02qBFQ1Yi2qMhVV00PsUc1AdskWzrgKJTJTuxoDE/r5U3kyCfxRFNoHTLGueJK55/1TYsvPM8hphX5Frum38tzmm9uohLJ7UZNTC9o71gviDcIS1yW+/+aIcQqAZ06PNfNjkrKDbUrE00rZx53dHFmZmuyXHv/nf8uqJ+AEEM3f09VTDfDskNQInyvB5el17oylGpVXs/k0dLB+9r5jkAcHkI2YakOz9qki1Wf2yTAesmG8zWYBKSE6ehP5MSXPHeVJ7LYX/IRPJt9PV68jc5KvCd/YLT6MisI4iRc9VlNcPBqORiTPgSq2SdWI7/T0rbeWfkJR1bYV+nqGG8NvbKs3JEDr0IMPIPTC+p5n1/fc0JKi+IjWQjFc8cDLTK+oEAJCvhBCZVTrU5EkwXkNJRVV6+2lMNl2KZLHiSP1KDzWJIoiGHaw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e5cba77f-25a6-4c49-ce7f-08d9f3b9cfbf X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Feb 2022 15:09:23.1932 (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: DB7PR03MB4732 Subject: [FFmpeg-devel] [PATCH 2/2] fftools/ffprobe: Remove redundant checks 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: eCcoJ9/n999m A decoder is only opened if there is a decoder for the codec, so every AVCodecContext here has AVCodecContext.codec set. Signed-off-by: Andreas Rheinhardt --- fftools/ffprobe.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index 4205ddedda..38b7e7e00f 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -2561,7 +2561,7 @@ static av_always_inline int process_frame(WriterContext *w, int ret = 0, got_frame = 0; clear_log(1); - if (dec_ctx && dec_ctx->codec) { + if (dec_ctx) { switch (par->codec_type) { case AVMEDIA_TYPE_VIDEO: case AVMEDIA_TYPE_AUDIO: @@ -2901,7 +2901,7 @@ static int show_stream(WriterContext *w, AVFormatContext *fmt_ctx, int stream_id break; } - if (dec_ctx && dec_ctx->codec && dec_ctx->codec->priv_class && show_private_data) { + if (dec_ctx && dec_ctx->codec->priv_class && show_private_data) { const AVOption *opt = NULL; while (opt = av_opt_next(dec_ctx->priv_data,opt)) { uint8_t *str;