From patchwork Tue Sep 24 22:03:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 15271 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 130CA449BE7 for ; Wed, 25 Sep 2019 01:03:51 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EE37E68A3EE; Wed, 25 Sep 2019 01:03:50 +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 60B00689DCF for ; Wed, 25 Sep 2019 01:03:45 +0300 (EEST) Received: by mail-wm1-f65.google.com with SMTP id a6so2051284wma.5 for ; Tue, 24 Sep 2019 15:03:45 -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=vbJeiWKQ1a75z22Yqhfxn4xZdQfYUg6VyiLJRx+3ivtsH9c1DXZDK6CgKyTA1CPb0B SY0zZRKFBBLT7QNjL50aWNtyTFch0m+2eerKBZg1tkdMPZT7cIaCOYYif0ymP6FZq2xv 6TyjWV07TyIVWpjD4ZusEfFWrbuUuubgVwuIJWPGRMTIWqnpV16at/S1epuJsIgDZi3W e1Jpll0hfH+Q2S29EiQtQ1jixaBYppJWIORZrp66WKIHpV5EnzmI2w4jxBm/jgFpOZZn Y5Errp9VMdTXxhH+Bb0J2lMFzZnjRi2F2Ok1xqPMp7TdfKxYjp1vJjxjJ2mNJbStOMVQ B8QA== 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=Op+VU4r2TRkkk7dAcH2OTVaLWZ40yFUtHaWSddvt1RI73yCXXz7aLAIPzVyrK96eLE +OOc/osPGtHc0y5LxkQLxUG7zaaIseRo4ikUhUGSZwh8K65rrFKLG+gYGkYC/m3D7Sal lxxgW8Fouk5EfIr6HU3fgpLeMJGaHhoUGYhnCLbg7F767qRG1i8K7ujIRwy9J0a9bW9z q7BmvwNrNPFZyXbd6CeMDIntTFf+4aT1oHua6arI4nmBaEB1gR2aeNM2LO9auaNIa0h7 pyQUUPs85P2+hri+46FK6K1OsP5ApAW7crdTd4924tUwUgmhcccTpTcBKbSK53Fz8QId SrcA== X-Gm-Message-State: APjAAAVCpYtoJFOTp+XCH9WqGNnoNqMiCYBLuZb62sGfd+2HxJkaRN2k NX1iSK5BudzerxMvHkstaLF3UEfF X-Google-Smtp-Source: APXvYqzJ75LuknoGNt7/zRoUjJkalutivv7RyeihzVoLmnT+U+bs8iM4KUWbB9AA1NXukEkkZzpFjA== X-Received: by 2002:a1c:4d4:: with SMTP id 203mr3024434wme.150.1569362624667; Tue, 24 Sep 2019 15:03:44 -0700 (PDT) Received: from sblaptop.fritz.box ([188.192.248.87]) by smtp.gmail.com with ESMTPSA id l1sm3023808wrb.1.2019.09.24.15.03.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Sep 2019 15:03:44 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 25 Sep 2019 00:03:06 +0200 Message-Id: <20190924220310.31157-12-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190924220310.31157-1-andreas.rheinhardt@gmail.com> References: <20190924220310.31157-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 11/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; } }