From patchwork Sat Sep 28 02:26:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 15352 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 44DB5449F5A for ; Sat, 28 Sep 2019 05:34:12 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 26F7A68A14B; Sat, 28 Sep 2019 05:34:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C8D77689956 for ; Sat, 28 Sep 2019 05:33:59 +0300 (EEST) Received: by mail-wm1-f65.google.com with SMTP id 7so7793929wme.1 for ; Fri, 27 Sep 2019 19:33:59 -0700 (PDT) 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=+/j7YD1sX0MKnjnm0pt0PQWM2P6TBNCA2chMcWz0Zgs=; b=crgPZmLzWLj8Sk9goPEVCEko/wFrbuaBTW1WomHPwMro7gi8ezcH7TrAoYTJRrEIQq 4lmHIje5bRdq6eox0m9qh1oGwOnsLwu3sPfBG33D61aptPd2D7AX1P3HQnTP0MM0QGKB gE6nUP0+A7v3mH8uCrAizuoQGw5l0Wsz4iWGDT3isXWaOlpWAlXK9uiu4B3OBt/I21yV mECdrW/hsF5VMLTDrq+w3ounNeB1/cpZ48xfRAD92aR4UMdLbF+9VC88f7GcjcPwPTac udW76LDOBDq2V45Dir7PZLGppshoo4Sa5Km4wZfg4KaBMPxBtmdt7gIL7Au7QtUHQyQL 5xyQ== 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=+/j7YD1sX0MKnjnm0pt0PQWM2P6TBNCA2chMcWz0Zgs=; b=cVi2abtx/vNF0OpDgnhCiVw1uWUjyXaM40cVTZXyElosgRsGbGCkl0Vze4OwXSdI5G vDPyB/Ok/fqAynQ6iEQ4WkutxbUaEkmACm6FVNt8UbP6Z9V3axKaBja/oDMnR3nLnPnU 2in7TNVrPPgMyl9D5KO7RmvlOHda5Irja+N9Yyxt9b7sxRWSi0ria1Fk7MboQaFXyDt1 0wxsC8qUutBM2XMj6EMlO238vGKL5M5vIzu8PPY16VpB/jJyjEnMr6FjIChdRqMDYn5Z yrbR00X/yuAvlH1ZPXc0QJ5k4bO83RjiqmE0e3gxexyhVDNvCvJp+uhqlD6BJ/Vm+ER0 V4sQ== X-Gm-Message-State: APjAAAVgFJe+DsqD6kc3rLFw4z7mFo3QWC1+NWWBUryB0KpDo+r+xv0v pKlPZk3xZcQKZttkrK0DHrS1Bze1 X-Google-Smtp-Source: APXvYqy78wtLMGjAv3iFaeY+Gn3Yt9wXYVnsAcRZaH34FH5PYgGKvwZblsXoMM9jLosV3kV46mZ0dg== X-Received: by 2002:a7b:c152:: with SMTP id z18mr8992658wmi.70.1569638039163; Fri, 27 Sep 2019 19:33:59 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc0f857.dynamic.kabel-deutschland.de. [188.192.248.87]) by smtp.gmail.com with ESMTPSA id r7sm4484231wrx.87.2019.09.27.19.33.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Sep 2019 19:33:58 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 28 Sep 2019 04:26:03 +0200 Message-Id: <20190928022610.5903-8-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190928022610.5903-1-andreas.rheinhardt@gmail.com> References: <20190928022610.5903-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 08/15] avformat/webmdashenc: Don't pass NULL to memcmp 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" Affects the FATE-tests webm-dash-manifest-unaligned-video-streams, webm-dash-manifest and webm-dash-manifest-representations. Signed-off-by: Andreas Rheinhardt --- libavformat/webmdashenc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/webmdashenc.c b/libavformat/webmdashenc.c index 26b8727304..f2b2fa8593 100644 --- a/libavformat/webmdashenc.c +++ b/libavformat/webmdashenc.c @@ -162,7 +162,8 @@ static int bitstream_switching(AVFormatContext *s, AdaptationSet *as) { strncmp(gold_track_num->value, track_num->value, strlen(gold_track_num->value)) || gold_par->codec_id != par->codec_id || gold_par->extradata_size != par->extradata_size || - memcmp(gold_par->extradata, par->extradata, par->extradata_size)) { + (par->extradata_size > 0 && + memcmp(gold_par->extradata, par->extradata, par->extradata_size))) { return 0; } }