From fa35ab80f31e269bd607044db2706b8b99e4ef5a Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Tue, 24 Jul 2018 22:32:59 +0200 Subject: [PATCH] lavf/isom: Make auxiliary_offsets consistently uint64_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/isom.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/isom.h b/libavformat/isom.h index fb361125c9..51abea52de 100644 --- a/libavformat/isom.h +++ b/libavformat/isom.h @@ -118,7 +118,7 @@ typedef struct MOVEncryptionIndex { uint8_t* auxiliary_info_sizes; size_t auxiliary_info_sample_count; uint8_t auxiliary_info_default_size; - size_t* auxiliary_offsets; ///< Absolute seek position + uint64_t* auxiliary_offsets; ///< Absolute seek position size_t auxiliary_offsets_count; } MOVEncryptionIndex;