2018-07-21 22:43 GMT+02:00, Michael Niedermayer <mich...@niedermayer.cc>:
> On Sat, Jul 21, 2018 at 03:52:19PM +0200, Carl Eugen Hoyos wrote:
>> 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
>
> This array is used to store 64bit values if version > 0, size_t
> may be smaller, is that intended ?
No, new patch attached.
Thank you, Carl Eugen
From e10383b0e27686f4650ee75b2e719579cf181e0a Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <ceffm...@gmail.com>
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 fb36112..51abea5 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;
--
1.7.10.4
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
