From patchwork Wed Feb 23 19:49:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34496 X-Google-Smtp-Source: ABdhPJzZtPzxWAX3YHtZg9Unri5r26YMVpG1+e6geZe4hNzUmCOo6iy9zAAz5Q/JSQtx6n+G1XKl X-Received: by 2002:a17:907:3115:b0:6b5:6ebd:d785 with SMTP id wl21-20020a170907311500b006b56ebdd785mr998820ejb.592.1645645816177; Wed, 23 Feb 2022 11:50:16 -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 i21si363215edc.391.2022.02.23.11.50.15; Wed, 23 Feb 2022 11:50:16 -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=Ca5DJCXN; 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 E1C0268B2EF; Wed, 23 Feb 2022 21:50:12 +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-oln040092074029.outbound.protection.outlook.com [40.92.74.29]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 20F1A68B1FD for ; Wed, 23 Feb 2022 21:50:06 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EIkZ9ZBS8ON9VPEEO+gf1JxyCuQSFJcON6tdgjafTUveq2U5KKdrgnTdrNnT4kYIeXIFpVhGn33UXn8G+MmJjb2thaVi/jsRPnkvc06I53J6vSHamJJAFAd+L58GfBMWoziTnTWNEmZ7tHWKKmaRO6zUUkiArZgWSTBRQbDfSdCoISdCJlYxqh+ceeDLls3bjN3eISHhIffeFy8lb4x60CVqquOkC4dPOei56ZY0r5L54sjfiQd5+xT5woDZeK8Xlk5vkRL0OBsnFdatipoJsIXvaZllCfuuDr86nfN8AJoK3EkwTbc6U7JAAAnsYbWNtV/WJD4bc/o2vOI0TfAIsg== 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=pdVMeQFZSq1W5+29iyiv2OtFsumaNy66b4lWqsYBRDY=; b=fOp22+qn98ybyiZpwr0E8A4O9jFhyF89Sbwmp5Ya0B9URZHolMcVjJS/VVMPOTze4loUQ+dbZIhcrxXyOVT0mNUjKX2m/Gw10rmyH9flUcf6AdxPffaCOLC7061M6LkhuU3tzx8P9GpPnmQWkOjSVkdYwO6tFSogUGfK9TaOXu0IwR0Hyaf11R2KhXh0Kta0VPGtW0r4/S9u5d/raUlEi5pPwWPmfbadqk2BkvHVZH+LoIccYP7AYsGeElBX5MjEJxvQTXMTq6My9ney1pJNbfaxdHB88DK9zgSkx3UB7F2B+P8FdQ3N+np1RBPNsJe5GCtqLd+N+g7OzENYyBBVjQ== 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=pdVMeQFZSq1W5+29iyiv2OtFsumaNy66b4lWqsYBRDY=; b=Ca5DJCXNjLX8FuxpN7nIVbWCMMnHzTdNzpbgClga8UYM5ZGJxpBPDaRxAvMG/st/XlhXCP8NqwMFfjjO5w9Q7wNf6HMSBNaGVRt9kKwH/C9ccknz7n0B795DuOCCQfRAxE7TFdOd7CBj7zBhd3jW2RRLneqhEQwAf92kGwm5PylB4ikyqxuEHubQieOA+/deYlO/fYFPp1VZDcBQlIo3wR5I0nvQvllb8n8y9OIhN/0KXKHvJLmS8iV8gJC9hXqMHRvSUtgHunhZ/66u4pi8FMtFhYSMT0UwXFYXM9WYftiY/NGWMsAmt+BAPBjpVPLjpvdM0VMNCyjnnjY4drYJMQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by VI1PR03MB3070.eurprd03.prod.outlook.com (2603:10a6:802:30::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.19; Wed, 23 Feb 2022 19:50:04 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::b8d3:effd:9a3c:4090]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::b8d3:effd:9a3c:4090%6]) with mapi id 15.20.5017.022; Wed, 23 Feb 2022 19:50:04 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 23 Feb 2022 20:49:55 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [F9no7eVKPeya3ypRSErStGaNzYptlU4n] X-ClientProxiedBy: AM6P193CA0107.EURP193.PROD.OUTLOOK.COM (2603:10a6:209:88::48) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220223194957.839153-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f246af9e-cfb3-4fda-2cc1-08d9f705af79 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTuO042wWhioe/P75j96X4Hd9V9zJdtJxJuHyHDimAQIfsEHoBxNY72u0dtrQp01Fat8R3hMlwRcuGRLmw1P7ftk52kKZfXFV707W0DpOHEuaMbONC8+zzQh1NRUxuAXwJLqMAfXavVUxfcJXrtDsmbEmS3YwlNDRvBBmym6Rh6A/vCeckSnyAyPuKgRc08m4s5OiY9g2N0ZBDabXYatkmVwUZWyS5GkHKJYmvPmZta/VGbAnnkdfmlXK6o1K1OWr+hp5vl9ek3F4CdhZsMMfwHV5Gjg3b9AtBf14h7VlNPL9vc4hCNkd1KWr2v5J2b7fuoFZAK0mAbi07KrE7/lYuYtZCptZeIVjOLN83mcA0PxVoXop74L/dZp6XOwIs3hcDmUqNRNok7rzcfWlXZhdKfosQf9xn5sn09sqIR37KcfT6ZEP12xMizTjkKiuZskG828zuSHZe5dEvsIm4AXLpUu+rSwicPwH3DHgeiXqBowa37lZwjyEQujjo0e+sba4grJP8IcxnNaPTcrF2xXZr+gcNxaxgLN9JmdaOSIsppxUKVPoPyPnu/aqXtSI9AzFwdOCdiElzQpVl+pLkthXZkDplkDNrHfZReQ+54Hu4m5kpBzZKQLMQUs4t5mU+u8D2pKJH8Czk68B9SZ+x/2lLeGG/Id/3vm53KsKq1IO2YptJm4G5ZZEpmk6kaxsLXpvdC/ZuBAOHwRUQmx4uPEWRc7SgZWZEtJT/oeP0KPkCerny3UIRHzs70rMwwX4GEr5c= X-MS-TrafficTypeDiagnostic: VI1PR03MB3070:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: y8NaFAMSinI72qzUKVr9ZrvdACErUwDT25YH7SlcpoyKwEGOpz/0RX2RwaOF92xmbvAHo8uXr5T5CbpKCALha9AOhyAuKFTBG833o/70P9CJy/IL7s4H6JY8VBycuq0zKlbRE6uYOG6C7VA9uBgqaZ6ztTayrBc0X2/BZluZ2dXJgp0vPGmaCj6P5/6VgtGUMOXAVdjnjADYgGBD04uGqi8lA6wQMqIYNeoR123QX7MqvRkx3Hsr95khoxA3DzHdimZuTaLqWqnh1sWIdHqjO+Hh0N1I3uq77c1UqchUfYhsfJmbZ3c0womzvqOnY7ZES9bDk2R6D1dy8yqeKiiiMNaegLLJ6QKXQtYOef9vAt3zX49V2pz1MZ2U0VKpTgUHnilyN5s15HicQPoVfNASHDsuAjUjMeFJtCeLegzVfNulSOA88VP/thKZUIqR9/exzhdZqDFRs8ZcDXzXbnlR0/RXIZJDynavzbOuJiF4957gAQyeaGuUjB4UyqjSZryiAOZAj3T/vNbYB6EiiPvFBsgvKjENW/4DAPFp1yvFOa8vyNV34GYszn4EOrtA1mK3K38NE2/cbYWxnspkqBMJUQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: sSrN07qjt3qjdNPZQecHOWcXXHbOAKqMYuSjxqj5u35i3lFtbXAZ30TswTwmVg4jC6/NZqTXrJ/vEmQv5WA5+lUNMw3iASueVvWScVEJvTCD2ATJgU5PXIm8BlJJYsYMKw6zlK+x1PJJKLZpB5X949dQDIaMaSsoxaR61Wzloa2zwpuPYw5HgcBoW8T15PTUAYwDsbDDW0tGizUfhTWjqWMnHUlDnS9YzFcttoSD/n//e7uaLrciatJmkG2z8TNhytcIjddx0tHZmZG5dT0iDbJsAPL8gIqyGaIw8dUcgaQzdVK0FDiP9afFsSmzGUq23rzfAWnl2LnipX/dCsZp0dxkbS9KULIJkkmMK18V+wVnEwaie0613Dork8KPcyWAFixuDW9LMZVkOSHcW220Lrhr7jxP6XZ+PG+SDc0lY87S1MYAovvbJgX0//eh/SjIzJ935i8/NCMtpAJ3UwettWct7JNcDySHoe4qSIfpPPPxqkqvtilI9GkhDfMIhr+Xjeyane9jzF/qEMJMhar/IkbZsBreGViL97hN+W+XjnCAXq5BtcgZ7pdbLG6J1E+wAfkxBse4FmlCgAPK64B2mJSzptjaETwcrZoaxOgpPSve0Pieo1wsRESpt1P7JTzJuO5i7mmxqHhrCQdHpeRkUQOmC2Z3ZctXmzkj1uOF32+yok+6FbNlPVcQ/ST6t5Kebfo+V5ONP1sy97gIJojvw81Bat4molv9HsJm3zpGIZAgG/dZsmSwR/Q2+g19iYIuUJUC1ao6TZMX1hRgIz1H4V9VEWgWul3XE1JDfFFBUJnCGxGTcCed399qyvBm5okyBcqlG3hyVEnn7LErG9BJuRcHuKapObbUSkC4plESZpTroCxsjIJDRVhTgbf8Z5pW66nkKIhefnHPJofBaMOzi0kalaVpq0NHTza3LbOgV0GWMe7RuwIX0PASr+yIhnk9BAeJp7z6nl1+xMRJwZ/qbg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f246af9e-cfb3-4fda-2cc1-08d9f705af79 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Feb 2022 19:50:04.3784 (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: VI1PR03MB3070 Subject: [FFmpeg-devel] [PATCH 1/3] fftools/ffmpeg_opt: Simplify adding new input/output streams 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: 7gKG5FHDhsBR Signed-off-by: Andreas Rheinhardt --- fftools/ffmpeg_opt.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 3102851885..c22c6aca06 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -784,7 +784,7 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic) for (i = 0; i < ic->nb_streams; i++) { AVStream *st = ic->streams[i]; AVCodecParameters *par = st->codecpar; - InputStream *ist = av_mallocz(sizeof(*ist)); + InputStream *ist; char *framerate = NULL, *hwaccel_device = NULL; const char *hwaccel = NULL; char *hwaccel_output_format = NULL; @@ -795,12 +795,7 @@ static void add_input_streams(OptionsContext *o, AVFormatContext *ic) const AVOption *discard_opt = av_opt_find(&cc, "skip_frame", NULL, 0, AV_OPT_SEARCH_FAKE_OBJ); - if (!ist) - exit_program(1); - - GROW_ARRAY(input_streams, nb_input_streams); - input_streams[nb_input_streams - 1] = ist; - + ist = ALLOC_ARRAY_ELEM(input_streams, nb_input_streams); ist->st = st; ist->file_index = nb_input_files; ist->discard = 1; @@ -1445,10 +1440,7 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e if (oc->nb_streams - 1 < o->nb_streamid_map) st->id = o->streamid_map[oc->nb_streams - 1]; - GROW_ARRAY(output_streams, nb_output_streams); - if (!(ost = av_mallocz(sizeof(*ost)))) - exit_program(1); - output_streams[nb_output_streams - 1] = ost; + ost = ALLOC_ARRAY_ELEM(output_streams, nb_output_streams); ost->file_index = nb_output_files - 1; ost->index = idx; From patchwork Wed Feb 23 19:50:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34495 X-Google-Smtp-Source: ABdhPJwpI8IfylNJuDQR9PICyFintseP+uckQRumsf7808UhUNVaDwi++kV3GqMTrIiHxl/NdcZN X-Received: by 2002:a50:fd16:0:b0:410:82ea:7911 with SMTP id i22-20020a50fd16000000b0041082ea7911mr952384eds.315.1645645874433; Wed, 23 Feb 2022 11:51:14 -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 tc20si227536ejc.815.2022.02.23.11.51.14; Wed, 23 Feb 2022 11:51:14 -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="ewvt/OCO"; 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 2255868B2EF; Wed, 23 Feb 2022 21:51:12 +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-oln040092074019.outbound.protection.outlook.com [40.92.74.19]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E9CFC68B155 for ; Wed, 23 Feb 2022 21:51:04 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DkIC+HDa4xvVvOlp0Q/Lg7GNJ0CmdHxj/0IiQ25salbr4Zr8R3RIk231uKRvjHBWDBVErI9dX0Op0+d9209wACoZrE1PF0CHT8l8QmGFHvkDuenQvhPL/92WXA9Qg2s70i4yWKIlOERsduH5QydqSLnO/XdD54YcHDSfYv48Z56iHLtTsvbMpRXSffwYG2DnzEhQYQjl1tKSY9LXyPfqCLGni01IJs9fM3MGPyCH17kmn0X+LW/Ue+ouJ1MupNhxDHJUgCEhknEc+ekMd0oLbUek/B+pkTiPRH6BGl5mMShCFtaO74QqTHEpVNTvURxh6ivZdIpTuDR/m4JhJsuDQQ== 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=XdlwPbuKSIkJAHbsKpWQNgexZtPLzq38zP9NiDX7VvE=; b=jBxs2tehmvR0nudYwm8hPXfjA7cTDvVchX5E1mfxTNanAmDWcV24KE0ZQsdAWcdNvJQcbBR5KJr+vOGePBOgc2gdzpbAz8nNWZa0O8eWQFSxhyB7m6eAWXKd14cWcMp9WrwZ0dKwPf/yNBuuyI2AvmnSWnKpjddN9QMbiw6aTgKQIhYhu8X+Yei7T2lGBX89ZtCWuHFSPSv+vqnxa7npyVO19XRADG4QDRRvcz9Jmh0eU5H1LYh1FevC5xajiC6kZCCaCCVGl6JQ6xrsH+/9uAsqot7rOlNGyVV+5vR87Q3RoxY1UNSGNs3+EClS7pjkF8DkXy+g4DQF848X98BvsQ== 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=XdlwPbuKSIkJAHbsKpWQNgexZtPLzq38zP9NiDX7VvE=; b=ewvt/OCOiI7r85P1wnubAC9Lpera//KOzDKN4n+nXZWqAQMN2qD07rhh1w/9sU3825JmmEArTxna0q/qqJa0blACuvoxjV+S9plU9Ys2KgB3ZlribLrjU0nza2dwAqmuRyk5O3pKeb7SwwFp1DThQuwPNxlUgYceWBINELTfsJgmC9s30p0UGTGW6S7OBxnofgueExtcV+WNh5YFU1g6dZ6Q1juDTF4OWucxJumDXR9eoard4GHrhs+bVc9CI9R+uzbQms6SNwAXXWDDo8iUMNunVVY34bqWBYGi/CpByIcCrY5uacc3yWOybC8pvG/NH/09BlntM0u4hPiVcwOqGQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by VI1PR03MB3070.eurprd03.prod.outlook.com (2603:10a6:802:30::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.19; Wed, 23 Feb 2022 19:51:03 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::b8d3:effd:9a3c:4090]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::b8d3:effd:9a3c:4090%6]) with mapi id 15.20.5017.022; Wed, 23 Feb 2022 19:51:03 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 23 Feb 2022 20:50:55 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [iDzj1+HMdonWgkEJE4QZDjTl9LfY1Xwv] X-ClientProxiedBy: AS9PR06CA0089.eurprd06.prod.outlook.com (2603:10a6:20b:464::14) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220223195056.873792-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e9667830-45c3-42ce-e333-08d9f705d2a2 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTuO042wWhioe/P75j96X4HIfWGitztaXHwN6onh9lD9tJ/s1k/s8GO+k0VQmsSUBm2GgZ6Ih0JOgkUp3lHN5OUnvLFaCuiIMaT+a4d7+6E7tAjfCVs1npBEkktVNc5aoZuGX9hTwTNILWXjxY/EvYf5aQJNdDQuru2GmxGujLDmcgPgjge3sanLWyN5DBtqu08ejKhwcDvv//9EGTe6zckWuxMMkx3zyrniSg0AVIZFB6aoI2q4ZeQ5l6wV0qr0AxFcipWC2BRAsN/hmru+o43FZuMiKkLT/hpLkrxMVXy2X+ye3BQ9A3HUaxaEVLOIjzbBoVity0adUCZ04DmU5kIPQF2vfu6ujCgbs7jUeZs+QSAtMdpr0SKNJDCQb5ujRTA6cR1z3OiRIfYpwZx+UcgkTYHjz1FXhE/zQMs2SLKe9U8CdhNSqvlqLjCCig2k5ILGr5/sEt0ZiK6p2+VA+BpNLGpEoxQlf875336sP9OAkuqdHKLt+moMqWTPKbhntPRj+/z4ohVWzEPniwJUDEIhXKGQ4ZCJJLbBWmc0EzVrYRmmlZbKF7lU+Gah4EjxVTHaqN16FfGsZl8hgPrvTuaLo4BhNAeKdhSyMaEZ4yEEx29ctjTNLFsa96AHrirhVXap8RvHurki3RyebkqluDIljIfrbOpZNExMA/m/Q05k53uoe3UriKO2aZHWqrNHnSBRgD0ad8ncizqDZ/Wg3+zAUA92dShdxtwVKo1ezUIpPS4JDsjw+3uI5mhnyLvc0A= X-MS-TrafficTypeDiagnostic: VI1PR03MB3070:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tiIubcCrYksTc1xwy1xrNhDDJZ4PzdZHCLRhoswzgWIVz4j5NSEP/chDVcw94dr+y/+SP2UhvvYHhFLQX9j2q9vQob91XOypp/RNJQk1dGNyMgZHXw+AlLFNP237vAOzDL4E0TqRDJFVQy0XIFsKXXn5zYjc7w5G9xfbZV8FbQcydqbg4IQ9TjW0lXdZoyh6WvO5HKzEnRBZ4gSnJiQpc+TL598Uox7uiJw3/c+s7FUVs9K9PcTvPIpMw7k0FlwXfE96Fbk13hnj4H/l/xJhNBGDOoFbyuIxE2+uZ0WNB0RUwLm9MsF4aaY+IWAh63R5euQMz4yVZN1dSAwmw81Fy3Zo8dkue2QKDYRxUSiu23qrXgBFgKh60ymGfVYcw0Xci2O5XBFqjAgm08oHhBxNCdMHO4LyGyCvxnqX8u+45hwHkhSa0lGWkI7luYlmVlenudWHVzPykzqAnw6YZg9nD9EFLuyIXqvWW3cuSXrRpxIJRwZCs9ZbKg59K3N1JEaqHcNq5KbRGs/i6MRQRFnw9IeOM54+PGlxma+l1fZQEYNd6dVcuzTiPB2HZ/kZJpP9Le2LAsL8ItEkkh5kuJZpJg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: wA7bNhA191pCs8oVgjokp2rRvrfO5KQVaGEK67td5CsdHW6XP+UzGLwenNWEnsM9NUwJ7jruUl5kQMBcgXsCshqGxuY0OrB6TlBMDZiHSyjP8oFn9PVGbj914RQl72CukF33g+m8aUsss+YeuZYwucbRSRQZEROzWCJbZQfXm458jTmweGuuSYPUkeHKF+BnBVI2/H5MBbglFOdfyJ+C3JI3lhJygtchrx0r3E6GbE7wF53fHSgtDjKrce94DYHZjU33dBF413o7KmJPC+TM/oCXjeRmpJhREJw1lxAVN9zPjC4bg47ZmWt5plQQeaSCaFCrK2BRxMJ3JAbbDO3zi1JUHyxrNweEIe1W6+7Vs6FKlytW6NSY2zXl5mDN1yw2xdyv3xIVzVDflCX4RI67KiPx3QC0m0oRLZV/Xo39QGaZoIMACi5upDvBTVWPp8VIriFlRZJkAFBc+V4yCHZBdCshNWhgr6WRW0GuHfGSCjOFRfow4wli9L4PZOpLQvVwlSP+CFFiTx08EoNeDkZoa/Z2CvL00z3Rn6/5llsRrZWwCUHCRi9VWjgKAJL0JZEvgxE6WfL4jpUzsggRN0ArrQ6TxXzl4oeBxXPdiiAUFShW0G3I2hfgfS3AFkeWhwKnUpNcugJz31ElIfpxTPsjRpdOvSMErcawESDZtmORsrThkeMpa0FkkIYw34iRJnbXMY15ancBE1WF9nKFzzL3u/Gzd0VlUNWgW635cPjwc7J5ls4068RTeqqJSlWmZmQGwxIBXJ0t0hJV/7SgjhBASTzO0TMRdG7XRzmbKOUNfVQTQaAXINoBQs9H/EMghVniz/4Mp6b6ldtbD7aa2P5qgZCNM2uiCqs1VGj4lrez8OJYXIYj5KzsbLuq2lT6pMRl1oMHvJhOIHo3pAwi83TQUFRehCQnVCOwUUCZw9Rh/BjWMIAw2EdnCBz+uAVz5tV5b0YM+3SF2VUQmgeztnv22A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e9667830-45c3-42ce-e333-08d9f705d2a2 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Feb 2022 19:51:03.2625 (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: VI1PR03MB3070 Subject: [FFmpeg-devel] [PATCH 2/3] fftools/ffmpeg_opt: Simplify adding complex filtergraph 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: P4YB8eEutRJw Signed-off-by: Andreas Rheinhardt --- fftools/ffmpeg_opt.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index c22c6aca06..44ec759e35 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -3271,9 +3271,8 @@ static int opt_audio_qscale(void *optctx, const char *opt, const char *arg) static int opt_filter_complex(void *optctx, const char *opt, const char *arg) { - FilterGraph *fg; - ALLOC_ARRAY_ELEM(filtergraphs, nb_filtergraphs); - fg = filtergraphs[nb_filtergraphs - 1]; + FilterGraph *fg = ALLOC_ARRAY_ELEM(filtergraphs, nb_filtergraphs); + fg->index = nb_filtergraphs - 1; fg->graph_desc = av_strdup(arg); if (!fg->graph_desc) From patchwork Wed Feb 23 19:50:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34497 X-Google-Smtp-Source: ABdhPJwwgACrr3AD+7EULRTpVqJH18iYSjJHCnES/QT0b3nhOugkULl1pKvNntu1MydVUNIAdHNx X-Received: by 2002:a17:906:2bd7:b0:6ce:698b:7531 with SMTP id n23-20020a1709062bd700b006ce698b7531mr977819ejg.146.1645645882384; Wed, 23 Feb 2022 11:51:22 -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 t4si258221edr.291.2022.02.23.11.51.22; Wed, 23 Feb 2022 11:51:22 -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=p8qFQkBV; 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 34C5668B2FF; Wed, 23 Feb 2022 21:51:17 +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-oln040092074019.outbound.protection.outlook.com [40.92.74.19]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1E38268B155 for ; Wed, 23 Feb 2022 21:51:10 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AC3wEeQ3q2p8D57j0eSgBOqRjtXdbT0kIt9WGMm1iXctrX8w9eYBc6qEnRuHM2BbXMbO2qd19WJ3ysJ3VI/ToIoz6eFbCMi/yc4Ow6S2gTiD1hKm2Rc+2qkRYWYmRmJ6kRh/sSa+yY9lXkSUqF1MvVgC0H5FUeGEFDIPHrRnRAyzD790GgUgI01CeOkWN34FzBI/KchUPFn949U5yvLCv0Z9jaUnAo4Foue2Dy0ttsfVAuUWHQoIDsnu1sLS7eJlOJ34oSE7O9zGwSjkm7nGbCZOMSeGt/KAEP+aoNCWMTVVsE9fUo15Dy44ev4HzfppEQHnf2gjOHW5Mi0k6dNYUg== 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=3BqkwRAtWoaSIZRKijkYDYdEcy0BJJh/U4NPIjPXdd8=; b=O0O/x7fR1R2mVuEjCEZscEOy5Oz2cQiUtXsboJ+vUNvV7VIgqUa4ogMQfeQ+TR5qUc9SyUOWuQwnOh3mvOHr0bbYMP/3MZl1PMZa7T/ij21coh8hHZbV1PG1b1jaGohomSTd+/0aNbK14wvLNSP7G9Kf+7Wl2x42/lfQrgTze5h17ST/cmLkonWvBZi5R8tqPLP5OkhV68EG+YZPrYKTyZqM8Wy10ZMfEsg2TIhlcULCzs654vbHd1q1UiU/wZhZqS3Zlqxy/Eu1LjvLKg1QFYXw2fC6Ha2dez97ym/mYpTdXHzLs8/cMxbwyh+EAbFqGcooW1KAZpJKoUPCLwpSwg== 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=3BqkwRAtWoaSIZRKijkYDYdEcy0BJJh/U4NPIjPXdd8=; b=p8qFQkBVZpJ+tjLacDJq0Sn6CRvt26VfR4n6m/7fM3LOCDjkTHSFTRRXw9gU05u0Q+TVKH3Iq+X+WE9U0Lyxb7rWqaR0y9LrCn14mjHoYkBuhfrxgyC1WLGqUnkBtb+nV+1y/83yW0z++spr0N9h4AiguqrePItu4SPqdTrT1bTV64Z+K4lKW7PZZVDA2gkjsE9Vwh8Nc4+OEcs5Sf8nUH4cAHC5yQTV71SHpXDzndj/DJFnSXhwGjrobQkQW73k8v1nPc72UlLAZeHVMSu4rRGNmrO7lxhV6TM0tuL5m3PhXVhTu4oYAK8MSYnuScE7H7yHt7Y4SJByTvkVMWh/Fw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by VI1PR03MB3070.eurprd03.prod.outlook.com (2603:10a6:802:30::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.19; Wed, 23 Feb 2022 19:51:06 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::b8d3:effd:9a3c:4090]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::b8d3:effd:9a3c:4090%6]) with mapi id 15.20.5017.022; Wed, 23 Feb 2022 19:51:06 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 23 Feb 2022 20:50:56 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220223195056.873792-1-andreas.rheinhardt@outlook.com> References: <20220223195056.873792-1-andreas.rheinhardt@outlook.com> X-TMN: [uQg5ctdbWZBFSnTJDDwvaW/c3UkDkEzq] X-ClientProxiedBy: AS9PR06CA0089.eurprd06.prod.outlook.com (2603:10a6:20b:464::14) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220223195056.873792-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2f7e4487-46a4-40d3-fc92-08d9f705d490 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTuO042wWhioe/P75j96X4HEtOcTfnsYIHIbNx4BpRa9njJZJp8KOl6FmYUCgTSN5cOu/0A5fk68dSBu2Ir0U1ay+QhTlDZqqJjwN1BLYxI2npsQkd5iKIadPP35ZdDWBpMQqFcts0FjUeuz2irm1DOP9v6UOIX8wsE0Sr5LLjl5YaDJwUGzfhXh30MspnEMXz2kC9mg76WWQk1oaqmnqGfJ3mPBGeTNVdo8OogaoxWAcuvp8wfeknS7GVD1GrdwDXcBzp15/aqUd3NKs/fpcK7Yh9ADXdhCNyD1i/Tfw/+i7DuCWKQ0CW9DpmpMKafIzL32Qv3L8JT0FYj/NDJKAUOIaMq5phHDx0NWHZUgw53xUAFT/3DCiJwR8wQY0yDM/CGg+VVyxiGEJIKZxlur2cAYz2sjgfVdg4siUuIiVx3gx74y85C7Nq1BB0IKR1FJKaWt4IVk3L1dr7hbK9yQyl75JrFkHHfYE4Q56LHn6NjO+IcReMZHMNuJjgi0toSdnCo5eeSyIaL3d2mpOp9A8XZ1QBCnNIIL3Yb5wsbrg/2ctuh5tpvBzTb4w7ZOa3bN588hUZuuDgrPQLsBwk2gRZJx3OCQqKJbL7ujgFGyg2QBhJRvuzva4tVYvQImLjw/+UO2vfVWvL0gCL1SBEs2DrZ37H7jDDV8Jy3/N4SEqbAEkco5UcodXmNwIxZyExevwNt7ASEUWU4dHqhWhEtMgr4CFycTGNYMQlpzfB7efQprzcxupJLdF0MOko6gYs0xRg= X-MS-TrafficTypeDiagnostic: VI1PR03MB3070:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: s+wmFJrJVkZgcb1ExgTrmRrR7EVAfDOiAMSyaGRxCYqsHxttm+Bx+LFIYsi8182DGIaLClSslhJqD5QreAirS6QpKpETvKOtcMtvX7+xVUzui9dNNnUeBUfzW2uTTrhJpLj+7imu7R76RONLgVnBXxd+CR9g37SFKCQ5J8NstNSrkUeMSJR7SMjWNVU/dEGu8QjpHFZCWmQm8nvvDpvtuhxHgmwMjRxEDEjpI7fJ/IKHdNK6P4kOCCLZl+EMHHPv/bwc3qPNNVAkyPfjVN1HT9VEjDIuMP9RxNsnxPsop+TOIvfthvJj7F1CY8EDHNb2bBpk0on+0+jBVWng4kuQiut3JDepl37aYhBQCfmSoEi11PzKL2IKbsdbQPc476aYgbWoZ6tVvX8dHEXnnMbe1paZdY2N0C32oqrf/t+QZSVQPhanW0KgGdWdvQ9v4NJyG+kf+kIWvQzNh/Lo3exDQ1AIREsrQNbPm5weMQWjpQ2sZVc7k09GeGTs3pvXIkawTRFaMQiHnVWMExh/o6VrYS0vXralAn8Axvso8ovlsP3BozTRU5YtwPCK2CUyN4j468d28PFFSg11g2H0OOyK9Q== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: wuSWGfhkC1khixpnIiN9wfJQ4AxBuIAtkv3vCXF9br5OoNlTzNOjFx1E1bZwPFVkvYuny4oYPqOx2B2aEha2wD6B//Hi1doJORXikZs/fZG5Zwa5TZRFTG+atmOw8k129mmvYFEos1hEgaG4vu/OxOaPn6N4pQOqivSmB5A0L9XlIIvzgJr5r/apDR/8PwV31dV+C0PSiAapBSAifCdwD+Zk7sdpQZL30WR6XXDtOxoqQYk2zMWQ5/XeEwprhXPvmPNp5m7B4JsGxm1b63zNW0LICkRC+11P6Ps4OTcH2LxWLW9VZFryVDEJv9Oyn/hQ0nQX3hFGo3Z+nslfEr7zRcHPXdGxainjuzUKA0cm1/2HMYiEyOlQ7r0c6GbCbLDcOQAJzf0cx4HlRfi/7syLf7Nv/bq4qfo3NmtiEOhjSubW+iNLIrp+bchmOtOHsl5nX0l91DU0iz4i2XpMKFwWmqTOratwC3oudTkVOqlfzVuteikhvfkuS7byx7QKyWeu3tSpT7d8ZTo0Sr5nWTZxVOMMxwd60KC3wVfkoLlv4WfDSRBLlFsmEUxv3WhdijkDjZNYt6yws7i/xo5GsOGe5SMyKeC/iizyKgg/ZdM7JqO8JvHDsQkbME0PlSaEGhOvn6xwm8ojfd2JJd16FdK3K6QPl1K1e9iiK63fIbblozIwi443YoY1qJCbDhNZviPHQuLgzFEnB75tuuc1vVM1Ik49KKBSsKBNL8zIHn6PPgM95VjowWQdDBfgkxKCKDNgtT+KmQPImzzujHBJkfTl6OCfOdQJNNMikHiiXYWBNZEIE3jjiJAM0cywFG4iYqAnsgEVvgGqKRzlUPuHwVFKRyGXYF+YmZPqtleQasILrn9fq5QnftFDGA+5bT5q2P0h5JJVqG4dASYT9TKmhCBetgqsmodqOd8+vLxe8/fRKdTqKrqNc5uSphnW8hbx8W4Y3hRbUn0+TTDBGsgluxc3Xg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2f7e4487-46a4-40d3-fc92-08d9f705d490 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Feb 2022 19:51:06.6085 (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: VI1PR03MB3070 Subject: [FFmpeg-devel] [PATCH 3/3] fftools/ffmpeg: Don't presume frame_queue to have been allocated 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: 9s9NR1aCiUnG Fixes segfaults upon allocation failure. Signed-off-by: Andreas Rheinhardt --- fftools/ffmpeg.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 7beea11933..e9de8fb430 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -527,11 +527,13 @@ static void ffmpeg_cleanup(int ret) for (j = 0; j < fg->nb_inputs; j++) { InputFilter *ifilter = fg->inputs[j]; struct InputStream *ist = ifilter->ist; - AVFrame *frame; - while (av_fifo_read(ifilter->frame_queue, &frame, 1) >= 0) - av_frame_free(&frame); - av_fifo_freep2(&ifilter->frame_queue); + if (ifilter->frame_queue) { + AVFrame *frame; + while (av_fifo_read(ifilter->frame_queue, &frame, 1) >= 0) + av_frame_free(&frame); + av_fifo_freep2(&ifilter->frame_queue); + } av_freep(&ifilter->displaymatrix); if (ist->sub2video.sub_queue) { AVSubtitle sub;