vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sat May 5 15:28:15 2018 +0300| [8544233e7fde2965435e32a445494898440ecc30] | committer: Rémi Denis-Courmont
avcodec: avoid signedness mismatch warning Bitmask should be unsigned, but ffmpeg seems confused with itself. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8544233e7fde2965435e32a445494898440ecc30 --- 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 6d04f85925..84514cb59d 100644 --- a/modules/codec/avcodec/audio.c +++ b/modules/codec/avcodec/audio.c @@ -592,9 +592,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 ) { _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
