From 80b38cd396667a669c85e44d26ca22378c051bd4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sat, 5 May 2018 15:28:15 +0300 Subject: [PATCH] avcodec: avoid signedness mismatch warning Bitmask should be unsigned, but ffmpeg seems confused with itself. (cherry picked from commit 8544233e7fde2965435e32a445494898440ecc30) Gbp-Pq: Name 0065-avcodec-avoid-signedness-mismatch-warning.patch --- modules/codec/avcodec/audio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ) { -- 2.30.2