From 3596de55fc054b5c336e7e542c26ced0505d4f2e Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 9 Jun 2012 20:14:12 +0200 Subject: [PATCH] audioconvert: use av_popcount64 in av_get_channel_layout_nb_channels --- libavutil/audioconvert.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libavutil/audioconvert.c b/libavutil/audioconvert.c index 2560127aac..1a8e5ee239 100644 --- a/libavutil/audioconvert.c +++ b/libavutil/audioconvert.c @@ -175,11 +175,7 @@ void av_get_channel_layout_string(char *buf, int buf_size, int av_get_channel_layout_nb_channels(uint64_t channel_layout) { - int count; - uint64_t x = channel_layout; - for (count = 0; x; count++) - x &= x-1; // unset lowest set bit - return count; + return av_popcount64(channel_layout); } uint64_t av_get_default_channel_layout(int nb_channels)