From patchwork Wed Feb 24 11:53:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25966 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 635BD44B5C7 for ; Wed, 24 Feb 2021 13:54:42 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4C89568A9EE; Wed, 24 Feb 2021 13:54:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3274268A8F3 for ; Wed, 24 Feb 2021 13:54:30 +0200 (EET) Received: by mail-wr1-f42.google.com with SMTP id l12so1623501wry.2 for ; Wed, 24 Feb 2021 03:54:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QSZz9XzgteAnG4XyjE+084hOK3Q9YNN40zf/9VJJ+l0=; b=dxt5mmejPx5uZL7J6QgOAuv3Sqnq8jIVYm+sPWOTA5K/MzW3VRfzC2AHVUjPwoy0tR HEic8H0UeVzMGgMTzSwpasr0wvB0pfblYT6L099MreJzuBVX/s3JfIxdD7jHKbHPYZsx W+zq/JFbX14bvc6HB/qtdxRL61cfYtJaXgF8KBWbt8EkK3eLRObqyNzbctY+8psRnFR1 EVQMXfGin1acHKtgVrExyJitmxpCcwBgew7ukDE6ATQkBdFX6A/scRoOHbn46LKurX5k Mm/MQsjBZtT0Feswk2f5DSXTbifO37rTlWbbc+MKYOfafWkGkKpRJRIT0zLglQhXGNFP wmaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QSZz9XzgteAnG4XyjE+084hOK3Q9YNN40zf/9VJJ+l0=; b=s9f137rLNBmLh9t8N3h0cjlHFbnXvh7zvBy/pAPoQU4BLBkCFkdgXi33itSIzevDDM ErrmsVg/DL17QSghyxEeGAs0KQ+ToGbBjZUYQQ7wo64XhGiCjhD9fK+SbrjVwCjsU8iK Ab1+/fySWyoYAmAr2hH4or6vJcTr1i3g4pGOXY9R88TwVbQoPhuzPC4fij04mUHgUlwU b3d5zBlD3vwF6sC6f6H2Ae7NTiQihufMtbZYKnzqXx2BOqwJnk3iSZrrnu6jSkPgndj4 jV59hEtfviCkIT0omoKalezVu3APugGQlYSkItVpZIBtO/Ywl6pBbUknaQyKjMA3VE8/ /oFg== X-Gm-Message-State: AOAM530le8+9X9A2wDDyC74oIgCzPxXUSmnJ9X/ykQl8/5FdCXfLQ8cL sF4dEbF3HvzmJb9K5ljXcfRguDM3574= X-Google-Smtp-Source: ABdhPJxwOiX98W44vrV6pF2FYKznlMuUkj+LbtA8bbqvfGLzfVx31O208V3sITwMTWttIoUl5SVu1g== X-Received: by 2002:a5d:5441:: with SMTP id w1mr31101820wrv.366.1614167669508; Wed, 24 Feb 2021 03:54:29 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id k15sm3911776wrn.0.2021.02.24.03.54.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Feb 2021 03:54:29 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Feb 2021 12:53:41 +0100 Message-Id: <20210224115341.794293-15-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210224115341.794293-1-andreas.rheinhardt@gmail.com> References: <20210224115341.794293-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 15/15] avformt/webmdashenc: Use av_strstart instead of strncmp X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" It makes the intent clearer and avoids calculating the length separately. Signed-off-by: Andreas Rheinhardt --- libavformat/webmdashenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/webmdashenc.c b/libavformat/webmdashenc.c index 04f8cbe39d..332d0466e1 100644 --- a/libavformat/webmdashenc.c +++ b/libavformat/webmdashenc.c @@ -133,7 +133,7 @@ static int subsegment_alignment(AVFormatContext *s, const AdaptationSet *as) for (i = 1; i < as->nb_streams; i++) { AVDictionaryEntry *ts = av_dict_get(s->streams[as->streams[i]]->metadata, CUE_TIMESTAMPS, NULL, 0); - if (!ts || strncmp(gold->value, ts->value, strlen(gold->value))) return 0; + if (!ts || !av_strstart(ts->value, gold->value, NULL)) return 0; } return 1; } @@ -152,7 +152,7 @@ static int bitstream_switching(AVFormatContext *s, const AdaptationSet *as) TRACK_NUMBER, NULL, 0); AVCodecParameters *par = st->codecpar; if (!track_num || - strncmp(gold_track_num->value, track_num->value, strlen(gold_track_num->value)) || + !av_strstart(track_num->value, gold_track_num->value, NULL) || gold_par->codec_id != par->codec_id || gold_par->extradata_size != par->extradata_size || memcmp(gold_par->extradata, par->extradata, par->extradata_size)) {