Unified · Split
| @@ -175,11 +175,7 @@ void av_get_channel_layout_string(char *buf, int buf_size, · 174 unmodified lines | ||
| 175 | 175 | |
| 176 | 176 | int av_get_channel_layout_nb_channels(uint64_t channel_layout) |
| 177 | 177 | { |
| 178 | − int count; | |
| 179 | − uint64_t x = channel_layout; | |
| 180 | − for (count = 0; x; count++) | |
| 181 | − x &= x-1; // unset lowest set bit | |
| 182 | − return count; | |
| 178 | + return av_popcount64(channel_layout); | |
| 183 | 179 | } |
| 184 | 180 | |
| 185 | 181 | uint64_t av_get_default_channel_layout(int nb_channels) |