diff mbox

[FFmpeg-devel] lavf/mov: Make auxiliary_offsets consistently size_t.

Message ID CAB0OVGpRTYPVW=zWWkMdgpD+TuGXEKAe3cfsnRoRGrpw_joW-w@mail.gmail.com
State Accepted
Headers show

Commit Message

Carl Eugen Hoyos July 24, 2018, 8:36 p.m. UTC 
2018-07-21 22:43 GMT+02:00, Michael Niedermayer <michael@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

Comments

Michael Niedermayer July 25, 2018, 6:03 p.m. UTC | #1 
On Tue, Jul 24, 2018 at 10:36:06PM +0200, Carl Eugen Hoyos wrote:
> 2018-07-21 22:43 GMT+02:00, Michael Niedermayer <michael@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

>  isom.h |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> f200dfc84a8bc6b4e61c71daa05f3fa567b42b6d  0001-lavf-isom-Make-auxiliary_offsets-consistently-uint64.patch
> From e10383b0e27686f4650ee75b2e719579cf181e0a Mon Sep 17 00:00:00 2001
> From: Carl Eugen Hoyos <ceffmpeg@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(-)

probably ok

thx
[...]
Carl Eugen Hoyos July 25, 2018, 6:07 p.m. UTC | #2 
2018-07-25 20:03 GMT+02:00, Michael Niedermayer <michael@niedermayer.cc>:
> On Tue, Jul 24, 2018 at 10:36:06PM +0200, Carl Eugen Hoyos wrote:
>> 2018-07-21 22:43 GMT+02:00, Michael Niedermayer <michael@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
>
>>  isom.h |    2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>> f200dfc84a8bc6b4e61c71daa05f3fa567b42b6d
>> 0001-lavf-isom-Make-auxiliary_offsets-consistently-uint64.patch
>> From e10383b0e27686f4650ee75b2e719579cf181e0a Mon Sep 17 00:00:00 2001
>> From: Carl Eugen Hoyos <ceffmpeg@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(-)
>
> probably ok

Patch applied.

Thank you, Carl Eugen
diff mbox

Patch

From e10383b0e27686f4650ee75b2e719579cf181e0a Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <ceffmpeg@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