From: Rémi Denis-Courmont <remi@remlab.net>
Date: Sat, 5 May 2018 12:28:15 +0000 (+0300)
Subject: avcodec: avoid signedness mismatch warning
X-Git-Tag: archive/raspbian/3.0.21-2+rpi1^2~10
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9b6a33aa46f3ae0aecd1aeebe222a8958676491b;p=vlc.git

avcodec: avoid signedness mismatch warning

Bitmask should be unsigned, but ffmpeg seems confused with itself.

(cherry picked from commit 8544233e7fde2965435e32a445494898440ecc30)

Gbp-Pq: Name 0004-avcodec-avoid-signedness-mismatch-warning.patch
---

diff --git a/modules/codec/avcodec/audio.c b/modules/codec/avcodec/audio.c
index 50a76c7a..e5af0ca5 100644
--- a/modules/codec/avcodec/audio.c
+++ b/modules/codec/avcodec/audio.c
@@ -593,9 +593,9 @@ static void SetupOutputFormat( decoder_t *p_dec, bool b_trust )
     uint32_t pi_order_src[i_order_max];
 
     int i_channels_src = 0;
-    int64_t channel_layout =
+    uint64_t channel_layout =
         p_sys->p_context->channel_layout ? p_sys->p_context->channel_layout :
-        av_get_default_channel_layout( p_sys->p_context->channels );
+        (uint64_t)av_get_default_channel_layout( p_sys->p_context->channels );
 
     if( channel_layout )
     {