avformat/mov_chan: rename mov_get_channel_label() to better reflect its purpose

This function turns a mov channel label into a lavf native bitmask.

James Almer committed 4 years ago

Commit 90ef7121 parent 854615a1 file · +2 −2Browse files

Showing the changes to libavformat (1 of 1 file). Show all

Unified · Split

libavformat/mov_chan.c+2−2

@@ -485,7 +485,7 @@ static uint64_t mov_get_channel_layout(uint32_t tag, uint32_t bitmap) · 484 unmodified lines
485	return layout_map[i].layout;	485	return layout_map[i].layout;
486	}	486	}
487		487
488	static uint32_t mov_get_channel_label(uint32_t label)	488	static uint32_t mov_get_channel_mask(uint32_t label)
489	{	489	{
490	if (label == 0)	490	if (label == 0)
491	return 0;	491	return 0;
@@ -590,7 +590,7 @@ int ff_mov_read_chan(AVFormatContext s, AVIOContext pb, AVStream *st, · 98 unmodified lines
590	avio_rl32(pb); // mCoordinates[2]	590	avio_rl32(pb); // mCoordinates[2]
591	size -= 20;	591	size -= 20;
592	if (layout_tag == 0) {	592	if (layout_tag == 0) {
593	uint32_t mask_incr = mov_get_channel_label(label);	593	uint32_t mask_incr = mov_get_channel_mask(label);
594	if (mask_incr == 0) {	594	if (mask_incr == 0) {
595	label_mask = 0;	595	label_mask = 0;
596	break;	596	break;