From patchwork Thu Mar 26 00:41:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18404 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a0c:ab15:0:0:0:0:0 with SMTP id h21csp280697qvb; Wed, 25 Mar 2020 17:42:04 -0700 (PDT) X-Google-Smtp-Source: ADFU+vtjJ4spn5tiYbs2iPtDPM/MDIXRI34ymH/gnxvorGceYyAHSJUBFYdz5ZPnLhSDoaRElnUZ X-Received: by 2002:a05:6402:504:: with SMTP id m4mr5020237edv.367.1585183324172; Wed, 25 Mar 2020 17:42:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585183324; cv=none; d=google.com; s=arc-20160816; b=mKP+bykWqDDiIQOOY52fwSE9RQuAxPvfylGdsPfYxsWMph7Ttan1Sa8B8ubyvkOUnG LF+Qn5pMViY0Z6y2KQAQUwNUtcJf0N+QE6J1cRagRqp8BrcwkDF7cplbR2TTA077Dv3u nUfRy5vzW+GG5dCWB4iAmXuavu46Svx3qZkEzYfmmLkQiKc03f7skzVrmd+C2ifEGa9r mSWYj5NDFZcC/VlYJy7al7l1Ei9rmUQ2dCf5O69S2bAoa2W5QGvO/jSmsTR04VgTyE2l bCQWoKfgysqyAeu5PXhcOqgEGjJ11mIPAToX3rCqS3d6cMaKlv+2RM8GMcccoNfqomo1 GyEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=5UT0+a16uoWubtbV41Jw21Lu0ClcvV7o2A+/eOp4paE=; b=Sn52boC2ee5O296t3mblZEKsT61kHmJRZPa2gfA3CYyVeKyGCOeO/KVZD0fgsnirMm LtO6sv+OOBYCvGJt3UJHM7kt+MUyz5wkv4Vu4vbE9+sJ/8jlNEU7MA6Tlv4+kt/0SI1c 4Z4hKx5ZjNZskJmHAMbmXwzg/YAN6j6yZVifPFzIFDLhjh2WdVyQtwClAa0db0307zV5 gUQTCdGySKPDwTxmG70b1N/rPLPTNnSXc0hUoJyiqfuxZpJz62EYr0qotTSobHabhHg9 XeHQagYZrzFc4HJ9DUwxsjI7/LBVYMGflAHepzkEPkY0UaKj/ZcS2xJb6+alqGlpjZlD C2hQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=j27oO7Vw; 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=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id x14si344305eds.0.2020.03.25.17.42.03; Wed, 25 Mar 2020 17:42:04 -0700 (PDT) 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=@gmail.com header.s=20161025 header.b=j27oO7Vw; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CD0BC68B474; Thu, 26 Mar 2020 02:42:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7729F68AF83 for ; Thu, 26 Mar 2020 02:41:55 +0200 (EET) Received: by mail-wm1-f53.google.com with SMTP id 26so6193006wmk.1 for ; Wed, 25 Mar 2020 17:41:55 -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:mime-version :content-transfer-encoding; bh=Y6hwL4lF99mO+jZEBuIYQVkEvXO1fSCCrsD7L8xYe3c=; b=j27oO7VwcSJR18k20rV+O97HXbvMKJII23Y/uSoxdzlknsECUvdo63tUCTG7AFVyAX qrq6DtE1D933N5fgehJo2oZIluFHJJlSMTN207x0MyVQ2VFJYrhrVordIFAS+676IzSV AO6QPaoEUQGiFW2z1ki0J5XR/xlD3k1X9D4hxn+/asAwY8q26egbF/yVvsWOCEPxzf0b 5d9L/D7dq/CTIRTGtuFK45TNMcyjUqvXNVokfc8gQq7CdXUnxNPkV4aZzQRaCDI/OLM5 SWT30849GQIFLAKzem0WqySGmjuDgkrF6FA1Ym5Z3wV2IbHpudkfNfcn1wOd9x+fEmA1 EkOA== 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:mime-version :content-transfer-encoding; bh=Y6hwL4lF99mO+jZEBuIYQVkEvXO1fSCCrsD7L8xYe3c=; b=qoEPBcbJC4ul8WtK+L6bUrfCareKgOMzbec3IlkG7QVQDSElVA+qUSAfVs4OH9xZxe cITQePdhceAV0i5BevUZs601XdCuzD4w6jAR+8fhX9UOVtZgGBaT1tx7fbpHjeRMiSJw qg9xAcNwDtrT7s7uSgCZW9zPPH0BU0ais/6qpu+Y/7gyXZYajD9XHzYsMP1T4DUdyQgN Nw9UfWNYOSAT/Vv78vOFkZonzhTyv+71Batnh+zNsf4x3cLbEZr770/2rtyVvjMgMFWz xNLNh7qfdc3TCcc+Teu28YjEaCB5DtERph9pWd6PTb1YwqeJAdXZyDEZP4/WNCNcrzQE qxhg== X-Gm-Message-State: ANhLgQ1/oRoQsiYVuJj8M0Zjc3yd8IJ7imttidIoQrnr0WJNxjfjC5yB iPIAIeGJie1DuqLIrGvpRCuyxdu/ X-Received: by 2002:a05:600c:3cb:: with SMTP id z11mr270880wmd.94.1585183314502; Wed, 25 Mar 2020 17:41:54 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id q72sm1142723wme.31.2020.03.25.17.41.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Mar 2020 17:41:53 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 26 Mar 2020 01:41:42 +0100 Message-Id: <20200326004144.26758-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avformat/matroskadec: Don't discard the upper 32bits of TrackNumber 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" X-TUID: VjyOYIRp6qYC Content-Length: 1938 Signed-off-by: Andreas Rheinhardt --- This has already been sent in [1]; I'm resending it because it fits here. [1]: https://ffmpeg.org/pipermail/ffmpeg-devel/2019-December/254841.html libavformat/matroskadec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 4d7fdab99f..6425973954 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1545,7 +1545,7 @@ static int matroska_probe(const AVProbeData *p) } static MatroskaTrack *matroska_find_track_by_num(MatroskaDemuxContext *matroska, - int num) + uint64_t num) { MatroskaTrack *tracks = matroska->tracks.elem; int i; @@ -1554,7 +1554,7 @@ static MatroskaTrack *matroska_find_track_by_num(MatroskaDemuxContext *matroska, if (tracks[i].num == num) return &tracks[i]; - av_log(matroska->ctx, AV_LOG_ERROR, "Invalid track number %d\n", num); + av_log(matroska->ctx, AV_LOG_ERROR, "Invalid track number %"PRIu64"\n", num); return NULL; }