Skip to content

Commit 78a24fd

Browse files
committed
avcodec/atrac9tab: use explicit ATRAC9BlockConfig struct initializers
Cosmetic change. Reviewed-by: Lynne <[email protected]> Signed-off-by: James Almer <[email protected]>
1 parent 5561a1d commit 78a24fd

File tree

1 file changed

+33
-46
lines changed

1 file changed

+33
-46
lines changed

libavcodec/atrac9tab.h

Lines changed: 33 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -41,61 +41,48 @@ typedef struct ATRAC9BlockConfig {
4141

4242
static const ATRAC9BlockConfig at9_block_layout[] = {
4343
{ /* Mono */
44-
AV_CH_LAYOUT_MONO,
45-
{
46-
ATRAC9_BLOCK_TYPE_SCE,
47-
},
48-
{ { 0 }, },
49-
1,
44+
.channel_layout = AV_CH_LAYOUT_MONO,
45+
.type = { ATRAC9_BLOCK_TYPE_SCE, },
46+
.count = 1,
5047
},
5148
{ /* Dual Mono */
52-
AV_CH_LAYOUT_STEREO,
53-
{
54-
ATRAC9_BLOCK_TYPE_SCE,
55-
ATRAC9_BLOCK_TYPE_SCE,
56-
},
57-
{ { 0 }, { 1 }, },
58-
2,
49+
.channel_layout = AV_CH_LAYOUT_STEREO,
50+
.type = { ATRAC9_BLOCK_TYPE_SCE,
51+
ATRAC9_BLOCK_TYPE_SCE, },
52+
.plane_map = { { 0 }, { 1 }, },
53+
.count = 2,
5954
},
6055
{ /* Stereo */
61-
AV_CH_LAYOUT_STEREO,
62-
{
63-
ATRAC9_BLOCK_TYPE_CPE,
64-
},
65-
{ { 0, 1 }, },
66-
1,
56+
.channel_layout = AV_CH_LAYOUT_STEREO,
57+
.type = { ATRAC9_BLOCK_TYPE_CPE, },
58+
.plane_map = { { 0, 1 }, },
59+
.count = 1,
6760
},
6861
{ /* 5.1 */
69-
AV_CH_LAYOUT_5POINT1,
70-
{
71-
ATRAC9_BLOCK_TYPE_CPE,
72-
ATRAC9_BLOCK_TYPE_SCE,
73-
ATRAC9_BLOCK_TYPE_LFE,
74-
ATRAC9_BLOCK_TYPE_CPE,
75-
},
76-
{ { 0, 1 }, { 2 }, { 3 }, { 4, 5 }, },
77-
4,
62+
.channel_layout = AV_CH_LAYOUT_5POINT1,
63+
.type = { ATRAC9_BLOCK_TYPE_CPE,
64+
ATRAC9_BLOCK_TYPE_SCE,
65+
ATRAC9_BLOCK_TYPE_LFE,
66+
ATRAC9_BLOCK_TYPE_CPE, },
67+
.plane_map = { { 0, 1 }, { 2 }, { 3 }, { 4, 5 }, },
68+
.count = 4,
7869
},
79-
{ /* 5.1 */
80-
AV_CH_LAYOUT_7POINT1,
81-
{
82-
ATRAC9_BLOCK_TYPE_CPE,
83-
ATRAC9_BLOCK_TYPE_SCE,
84-
ATRAC9_BLOCK_TYPE_LFE,
85-
ATRAC9_BLOCK_TYPE_CPE,
86-
ATRAC9_BLOCK_TYPE_CPE,
87-
},
88-
{ { 0, 1 }, { 2 }, { 3 }, { 4, 5 }, { 6, 7 }, },
89-
5,
70+
{ /* 7.1 */
71+
.channel_layout = AV_CH_LAYOUT_7POINT1,
72+
.type = { ATRAC9_BLOCK_TYPE_CPE,
73+
ATRAC9_BLOCK_TYPE_SCE,
74+
ATRAC9_BLOCK_TYPE_LFE,
75+
ATRAC9_BLOCK_TYPE_CPE,
76+
ATRAC9_BLOCK_TYPE_CPE, },
77+
.plane_map = { { 0, 1 }, { 2 }, { 3 }, { 4, 5 }, { 6, 7 }, },
78+
.count = 5,
9079
},
9180
{ /* Quad */
92-
AV_CH_LAYOUT_QUAD,
93-
{
94-
ATRAC9_BLOCK_TYPE_CPE,
95-
ATRAC9_BLOCK_TYPE_CPE,
96-
},
97-
{ { 0, 1 }, { 2, 3 }, },
98-
2,
81+
.channel_layout = AV_CH_LAYOUT_QUAD,
82+
.type = { ATRAC9_BLOCK_TYPE_CPE,
83+
ATRAC9_BLOCK_TYPE_CPE, },
84+
.plane_map = { { 0, 1 }, { 2, 3 }, },
85+
.count = 2,
9986
},
10087
};
10188

0 commit comments

Comments
 (0)