From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 60AAC48849 for ; Sat, 20 Jan 2024 12:22:57 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B94B368022B; Sat, 20 Jan 2024 14:22:54 +0200 (EET) Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D237068022B for ; Sat, 20 Jan 2024 14:22:47 +0200 (EET) Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-1d70b0e521eso12540515ad.1 for ; Sat, 20 Jan 2024 04:22:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705753365; x=1706358165; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=wjXHYFl18fm0nN9x4SF1ymY/3d88z44Oce9f7MC1qD0=; b=Q0jkcXRCRaHhxrWhUGHm6+rU7fVH69auYT3CPu2Zn4GunCsvLnxEUsML3tYeKAUpfR 4f8tEKMM8pwWDYA02eicCO3cTfbaacs5/9B34obXBxR/qjiTRVxwmTT54r/ITxc4RGHZ 16W4E+DYNn2Pk90ofZnFPYiPRLdeaOhL9WDySCHhCQ+RgQYLTmvi7DZ1ZfEeG0+YAsP3 ehgRSrLBo7DhX/+89LIAK15GEpP67do2BpoyjXLH8X4X//sAaQepk8qShunL+UEJvkaz G0emZusHuaCkaUnmpJ5WQTpmVU1QRBvnZ+Wk+KtqIxeh+abpD+j1UIVbvd/xKfIzjmP2 F1Xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705753365; x=1706358165; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=wjXHYFl18fm0nN9x4SF1ymY/3d88z44Oce9f7MC1qD0=; b=dTGHFaITdubOiGDsmG7hIOGQx00+TprJPyCer0tOlxkBYij28UX4kpL3CbV0ukpwfn WltrkRN2+lQOC7Hp3ptuTeggSHs1PCrs8RbXVV8FZm2KYv6WtvBw7Xj+cS0bcjfpkh0K U828NBBtBZg/bw0svnP2eIMKf3gFgnBO2yUC3MINBZ9owNJSnFPBiK/7w16Jrm52t/mn CLKIxUjA2n8vCNv8lcZJRbjoxZZLs1Md9hEwo0plNqaOLMVwIWOZRaUMJJK6x/LuBSmP 5ES7QVRPiAW0lm6lnkEw8C+jj4c/A5eUwhDrcy+yL7EGQa5dV+/FM+6b7zv7uPUveP7F WHLg== X-Gm-Message-State: AOJu0Yx8nZGZx8eCmuGo1WnJ+oeqLzREWacGzqh4qKXU4WK1lvcNdw/d 9q4uMsMrS2rdxB8WZihvSxuRPqrSDd3eZOmyxGHAnPTAnLe8U7QRYIXnmKw2 X-Google-Smtp-Source: AGHT+IGWTYy+PN2BFIAXhihUTFs3bSMT6/e2FdZKZxVTwiJJC0+WFBDtWx5rNd55yN60Q19CW+ICTA== X-Received: by 2002:a17:902:b697:b0:1d7:2536:639a with SMTP id c23-20020a170902b69700b001d72536639amr1458367pls.134.1705753365080; Sat, 20 Jan 2024 04:22:45 -0800 (PST) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id kl5-20020a170903074500b001d72d445778sm1129365plb.204.2024.01.20.04.22.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Jan 2024 04:22:44 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 20 Jan 2024 09:22:26 -0300 Message-ID: <20240120122227.2382-1-jamrial@gmail.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] fftools/ffmpeg_mux_init: remove whitespaces from input arguments when parsing stream groups 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: If the arguments are read from a file, things like line breaks could be present Signed-off-by: James Almer --- fftools/ffmpeg_mux_init.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index b527e1f118..15200c5a7d 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -2025,6 +2025,8 @@ static int of_parse_iamf_audio_element_layers(Muxer *mux, AVStreamGroup *stg, ch int demixing = 0, recon_gain = 0; int layer = 0; + if (ptr) + ptr += strspn(ptr, " \n\t\r"); if (av_strstart(token, "layer=", &token)) layer = 1; else if (av_strstart(token, "demixing=", &token)) @@ -2092,6 +2094,8 @@ static int of_parse_iamf_submixes(Muxer *mux, AVStreamGroup *stg, char *ptr) const char *subtoken; char *subptr = NULL; + if (ptr) + ptr += strspn(ptr, " \n\t\r"); if (!av_strstart(token, "submix=", &token)) { av_log(mux, AV_LOG_ERROR, "No submix in mix presentation specification \"%s\"\n", token); goto fail; @@ -2120,6 +2124,8 @@ static int of_parse_iamf_submixes(Muxer *mux, AVStreamGroup *stg, char *ptr) const AVDictionaryEntry *e; int element = 0, layout = 0; + if (subptr) + subptr += strspn(subptr, " \n\t\r"); if (av_strstart(subtoken, "element=", &subtoken)) element = 1; else if (av_strstart(subtoken, "layout=", &subtoken)) @@ -2331,8 +2337,11 @@ static int of_add_groups(Muxer *mux, const OptionsContext *o) return ret; token = av_strtok(str, ",", &ptr); - if (token) + if (token) { + if (ptr) + ptr += strspn(ptr, " \n\t\r"); ret = of_parse_group_token(mux, token, ptr); + } av_free(str); if (ret < 0) -- 2.43.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".