From patchwork Sat Jul 21 13:52:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 9770 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp3903507jad; Sat, 21 Jul 2018 06:52:30 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfrqd3VzGAabzfy9GFKvW8JFjDx2zDZZDaMz8eel4EligCept56tYOYlEz4BwGBgxTy1Nae X-Received: by 2002:adf:ad38:: with SMTP id p53-v6mr4178228wrc.10.1532181150834; Sat, 21 Jul 2018 06:52:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532181150; cv=none; d=google.com; s=arc-20160816; b=EiQ+6sirQXUW7H3boVB1m6WIKxKkEdvQ+TRvYKLUYyZisa54y+xN68toU03IcTzSdV MK2dk3+v6kydBdqaDSrfxEWEIT41707ZHsEXcQJD6+/bn1QerERXYdpsEEHO+J69nL1H 8DGd4v7i4cgum3Ih0DFFg4A9pNEk/JIbOxbGULPFBIPTGUZEupvL3v7m1n1Wwc5c9S+t Hw4cTswU1SCN/qmvXXkUWgsWTTUgd5wTe0CnieRrv481WlMVfgoUzsX+sh6CnOAoscV+ GEajVDEbDkl/ldf5Q+V1RUmQO+vKGLw1ulCgpjG/ZDJ/DH+VoRgBNS6bXJBH+nk1uyM2 2zTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to :arc-authentication-results; bh=DH+FS7q+/F7vJrTTc/e54umzjZq9fTRhXpOztj2J+aQ=; b=hq+TZD3ApKvKQBoPmoZXdM+BXGetF8ffdfAjt0sQdUacZJQi4IcTw9btFApP6JIe83 tJSG6Lnwp3utuEhRP6QF8nu9+ZqxZiiiODpNlkDSP0ZtbABL6UjdPoIPX4vGP8XZQDDC h54LD2CJMY8WbnJhmuRlMUtLq7dr9c0FhYO1G+Lbrxku/wiyKppGEljRLjl6hamr84pB kKsZ3tCZv5zz5pRUNptodAy73btBpsgtjlUoHz5Le/b5DLeCEDFV0GDBE+rVoVFpXbsZ RAQZHk7OWtmRf8hFWuGeWwECpED5ARlwLntcC1zXPxyCrPR4yC8wgwNTyeMbPxmqNsoK YR/A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=V5fmlxlP; 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 x5-v6si3182480wrr.349.2018.07.21.06.52.29; Sat, 21 Jul 2018 06:52:30 -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=V5fmlxlP; 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 9FD6468A254; Sat, 21 Jul 2018 16:52:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it0-f41.google.com (mail-it0-f41.google.com [209.85.214.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5C867680A8D for ; Sat, 21 Jul 2018 16:52:09 +0300 (EEST) Received: by mail-it0-f41.google.com with SMTP id p4-v6so18329024itf.2 for ; Sat, 21 Jul 2018 06:52:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=Cta8h5oTiWo3DmrR85aoT64hhTL5M2/lXxavHQkScyA=; b=V5fmlxlPeyn7hh/ewnB+yn9f46LfbaPC/PM6gyH91Qs+pQIg8cA9e4MOwVreTmU/le tNBgUMHj5UxClXAd7rMEiI7hSSWzIM/jsucqATHE3Mr9TDRGkHr3ovPgiI0CuFXu6XbQ fcaptdHFtuLdeD6UtpD5iq38HTMYpOldCuHHreFvSY06oI/bn1KkgAv0Lzq3vkjf0YDB YWThVzb336ESU4+zRVJsXPtMkTxGACyogHut8IIJPaLHyfpEsb48CwBEV8Oa4Jsz2fq2 eNy4cpaWNkhXt4piFlPApgd5VVVIkYN4RzQnxOUq8dXhK+S0W1/DGUt16bFWJnHARdfu xBaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=Cta8h5oTiWo3DmrR85aoT64hhTL5M2/lXxavHQkScyA=; b=lA0L3O/KMLL9U6IS113cJdcwWmZqSNsZ0L+g97eZw28JdyjAjNqXbeWrTODtgpoEwY dAE/j5QyzVnZSo2hyeEal3W2uLDXmxSsI/5lmcWFJSC+o6YQTogzAEC3D1ZkVQINGwI+ Ls7pa1NabvA3Azp5PE5cjLxhK/WAOce/UHplYWqvprpmAOaIs1RlURbjIYOeMv8UUvTw L4Y4KEgmWvt7Zzapm4WOMLahoUM0DFK/cj9FiYnor6OKssplKX8aMjXlpRTBEUM05Ndx LYjoENympKkfiuRIB0Dxo8A0ssXtaEuEHNwnDmet45FRX6YYWU8CAOmt3y/Vx2oi2a6Q 5b/g== X-Gm-Message-State: AOUpUlHkrVwQefmr9+nNpeTRI7zK7TK9ShvLuweHCdLZwseXhhTg8JiM ih885VhkbvyOCp0lKMAcGMDQUAKzD90cF1yT2FLsdg== X-Received: by 2002:a24:cb03:: with SMTP id u3-v6mr5099039itg.15.1532181140202; Sat, 21 Jul 2018 06:52:20 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a02:7117:0:0:0:0:0 with HTTP; Sat, 21 Jul 2018 06:52:19 -0700 (PDT) From: Carl Eugen Hoyos Date: Sat, 21 Jul 2018 15:52:19 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]lavf/mov: Make auxiliary_offsets consistently size_t. 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Hi! Attached patch fixes a warning on ppc32: libavformat/mov.c: In function ‘mov_read_saio’: libavformat/mov.c:6207:45: warning: assignment from incompatible pointer type [-Wincompatible-pointer-types] encryption_index->auxiliary_offsets = auxiliary_offsets; ^ Please comment, Carl Eugen From dd861ac4c0fd18fab88de91a5b91b2114bb4fd89 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Sat, 21 Jul 2018 15:47:02 +0200 Subject: [PATCH] lavf/mov: Make auxiliary_offsets consistently size_t. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes a compilation warning if size_t != uint64_t: libavformat/mov.c: In function ‘mov_read_saio’: libavformat/mov.c:6207:45: warning: assignment from incompatible pointer type [-Wincompatible-pointer-types] encryption_index->auxiliary_offsets = auxiliary_offsets; ^ --- libavformat/mov.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 870c603..061cad0 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -6138,7 +6138,7 @@ static int mov_read_saiz(MOVContext *c, AVIOContext *pb, MOVAtom atom) static int mov_read_saio(MOVContext *c, AVIOContext *pb, MOVAtom atom) { - uint64_t *auxiliary_offsets; + size_t *auxiliary_offsets; MOVEncryptionIndex *encryption_index; MOVStreamContext *sc; int i, ret; -- 1.7.10.4