generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cook: use av_get_channel_layout_nb_channels() instead of cook_count_channels()

Browse Source
This commit is contained in:
Justin Ruggles 2012-10-21 14:36:38 -04:00
parent d21b2e4726
commit 7efbba2e36
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/cook.c
View File

@ -1034,16 +1034,6 @@ static void dump_cook_context(COOKContext *q)
} }
#endif #endif
static av_cold int cook_count_channels(unsigned int mask)
{
int i;
int channels = 0;
for (i = 0; i < 32; i++)
if (mask & (1 << i))
++channels;
return channels;
}
/** /**
* Cook initialization * Cook initialization
* *
@ -1147,7 +1137,7 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)
if (extradata_size >= 4) if (extradata_size >= 4)
channel_mask |= q->subpacket[s].channel_mask = bytestream_get_be32(&edata_ptr); channel_mask |= q->subpacket[s].channel_mask = bytestream_get_be32(&edata_ptr);
if (cook_count_channels(q->subpacket[s].channel_mask) > 1) { if (av_get_channel_layout_nb_channels(q->subpacket[s].channel_mask) > 1) {
q->subpacket[s].total_subbands = q->subpacket[s].subbands + q->subpacket[s].total_subbands = q->subpacket[s].subbands +
q->subpacket[s].js_subband_start; q->subpacket[s].js_subband_start;
q->subpacket[s].joint_stereo = 1; q->subpacket[s].joint_stereo = 1;