[vlc-commits] hls: Removing warnings.

2012-01-24 Thread Hugo Beauzée-Luyssen 
vlc/vlc-1.2 | branch: master | Hugo Beauzée-Luyssen  | Tue 
Jan 24 16:39:35 2012 +0100| [5f5897cbb70c9e19d36d6f4a6aae1783c5d50f7a] | 
committer: Jean-Baptiste Kempf

hls: Removing warnings.

Signed-off-by: Jean-Baptiste Kempf 
(cherry picked from commit f180bd5f1a8d065cd9ae0ae0409d74f645b4df3a)

Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=5f5897cbb70c9e19d36d6f4a6aae1783c5d50f7a
---

 modules/stream_filter/httplive.c |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/stream_filter/httplive.c b/modules/stream_filter/httplive.c
index 4d6e550..6cdebb3 100644
--- a/modules/stream_filter/httplive.c
+++ b/modules/stream_filter/httplive.c
@@ -1176,7 +1176,7 @@ static int hls_DownloadSegmentKey(stream_t *s, segment_t 
*seg)
 len = stream_Read(p_m3u8, aeskey, sizeof(aeskey));
 if (len != AES_BLOCK_SIZE)
 {
-msg_Err(s, "The AES key loaded doesn't have the right size (%d)", len);
+msg_Err(s, "The AES key loaded doesn't have the right size (%zd)", 
len);
 stream_Delete(p_m3u8);
 return VLC_EGENERIC;
 }
@@ -1861,7 +1861,7 @@ static ssize_t read_M3U8_from_stream(stream_t *s, uint8_t 
**buffer)
 if (total_allocated)
 total_allocated *= 2;
 else
-total_allocated = __MIN(bytes+1, sizeof(buf));
+total_allocated = __MIN((uint64_t)bytes+1, sizeof(buf));
 
 p = realloc_or_free(p, total_allocated);
 if (p == NULL)

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] hls: Removing warnings.

2012-01-24 Thread Hugo Beauzée-Luyssen 
vlc | branch: master | Hugo Beauzée-Luyssen  | Tue Jan 24 
16:39:35 2012 +0100| [f180bd5f1a8d065cd9ae0ae0409d74f645b4df3a] | committer: 
Jean-Baptiste Kempf

hls: Removing warnings.

Signed-off-by: Jean-Baptiste Kempf 

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f180bd5f1a8d065cd9ae0ae0409d74f645b4df3a
---

 modules/stream_filter/httplive.c |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/stream_filter/httplive.c b/modules/stream_filter/httplive.c
index 4d6e550..6cdebb3 100644
--- a/modules/stream_filter/httplive.c
+++ b/modules/stream_filter/httplive.c
@@ -1176,7 +1176,7 @@ static int hls_DownloadSegmentKey(stream_t *s, segment_t 
*seg)
 len = stream_Read(p_m3u8, aeskey, sizeof(aeskey));
 if (len != AES_BLOCK_SIZE)
 {
-msg_Err(s, "The AES key loaded doesn't have the right size (%d)", len);
+msg_Err(s, "The AES key loaded doesn't have the right size (%zd)", 
len);
 stream_Delete(p_m3u8);
 return VLC_EGENERIC;
 }
@@ -1861,7 +1861,7 @@ static ssize_t read_M3U8_from_stream(stream_t *s, uint8_t 
**buffer)
 if (total_allocated)
 total_allocated *= 2;
 else
-total_allocated = __MIN(bytes+1, sizeof(buf));
+total_allocated = __MIN((uint64_t)bytes+1, sizeof(buf));
 
 p = realloc_or_free(p, total_allocated);
 if (p == NULL)

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits