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;