From patchwork Thu Dec 26 10:53:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16975 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 DAE6D449EFF for ; Thu, 26 Dec 2019 12:54:30 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C8DC468AC23; Thu, 26 Dec 2019 12:54:30 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EFFFF68AC2D for ; Thu, 26 Dec 2019 12:54:29 +0200 (EET) Received: by mail-wm1-f68.google.com with SMTP id c127so4885221wme.1 for ; Thu, 26 Dec 2019 02:54:29 -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=ZTLcsOuqrv1rdVVg1EqPp0Kd7Kppn3YRENGMUMsxcfs=; b=ROdOcZGkwMSUn/rBkRXD2E0hLZ52VV5s09oBTPXFa2Js40ku1GRulhdRqHEjBXB85M YW3ydTFP+5q/7MbwnGD/7yafBqz1F9f1X87CIz4Jt7DY1P33rjETOGK1UXbPMJICesmo xUEyWw8l95jVeJRkzP55ixRH17Br15fMb1R4VQQgntxx/xxMrCEQ29OFo4D6TvFTLkxq 0ZlB1CHOy/7EUlHLbZc7vIXXiLGhcY8Zd2FD677WAIJ5f2fkGWBtMNsKowScv99RGmLE niSi4ahLG3qk6jYbRS44gPXlPU4BkgjXlqWzTd+WMIdBgFwXRiLSBTyFYFRpWYU9G04o aNSg== 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=ZTLcsOuqrv1rdVVg1EqPp0Kd7Kppn3YRENGMUMsxcfs=; b=YB8iv0JptbAW0SPPJ/4u5EKMKrXPo1Mb96RKpUjYZBhW81Bnea2Yqk+JCBgjHkJ1Q7 CUqFyh5l9I9s8h0esH3a7viOCdyWT1PqtkS50mM8df/ZRdV+6KD8Cbo3msrRi35AtQ+H Z+zr9SeGxsm38KCMPRmPVM8YeRapFx6YV3QcmXrYQf0IKA68O3V5Les/42wZw4UqckV9 5d94OkTgisC/9zFhpJjzHFg3kWIF08H53O5ZLXfjdPew7Cc7Q5jkZtAdl+Je2G8OAgNH ugisiJTtdfWLKyPwRk8viYwK8ei+NUW2iTl36LCrr2QibMLsYvdWWok2VLca093bR0eZ H25Q== X-Gm-Message-State: APjAAAXuKqfyH/NJ3p1HTwOPzKqEiO99aaCC6PEvNR+oC439XoOdpUXw mgTZktVnA7ey7f8tMHCPIsgCqvlO X-Google-Smtp-Source: APXvYqx4hwh6qKhoEipYeUcfgOQVIFu3OuO99dssZdaHGh2s1CLn9J/+17IhkgcMLQLIjzUJK6XLHg== X-Received: by 2002:a7b:c85a:: with SMTP id c26mr13578222wml.107.1577357668990; Thu, 26 Dec 2019 02:54:28 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc10203.dynamic.kabel-deutschland.de. [188.193.2.3]) by smtp.gmail.com with ESMTPSA id c68sm7997618wme.13.2019.12.26.02.54.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Dec 2019 02:54:26 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 26 Dec 2019 11:53:42 +0100 Message-Id: <20191226105342.11175-17-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191226105342.11175-1-andreas.rheinhardt@gmail.com> References: <20191226105342.11175-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 17/17] 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" Signed-off-by: Andreas Rheinhardt --- libavformat/matroskadec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index fe4a444410..268a2dd476 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1542,7 +1542,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; unsigned i; @@ -1551,7 +1551,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; }