diff options
| author | James Almer <jamrial@gmail.com> | 2019-10-22 10:01:13 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2019-10-22 10:49:30 -0300 |
| commit | 78a24fd0140e2b41f09a560be1dcb0203f1b518d (patch) | |
| tree | 5e665d6971792da79baa6d1171682fb134b0d6e5 | |
| parent | 5561a1de90cd3f80ab9ec543f28b6e96a9d0a86c (diff) | |
| download | ffmpeg-78a24fd0140e2b41f09a560be1dcb0203f1b518d.tar.gz | |
avcodec/atrac9tab: use explicit ATRAC9BlockConfig struct initializers
Cosmetic change.
Reviewed-by: Lynne <dev@lynne.ee>
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavcodec/atrac9tab.h | 79 |
1 files changed, 33 insertions, 46 deletions
diff --git a/libavcodec/atrac9tab.h b/libavcodec/atrac9tab.h index d25c6f1b7f..8f290f158c 100644 --- a/libavcodec/atrac9tab.h +++ b/libavcodec/atrac9tab.h @@ -41,61 +41,48 @@ typedef struct ATRAC9BlockConfig { static const ATRAC9BlockConfig at9_block_layout[] = { { /* Mono */ - AV_CH_LAYOUT_MONO, - { - ATRAC9_BLOCK_TYPE_SCE, - }, - { { 0 }, }, - 1, + .channel_layout = AV_CH_LAYOUT_MONO, + .type = { ATRAC9_BLOCK_TYPE_SCE, }, + .count = 1, }, { /* Dual Mono */ - AV_CH_LAYOUT_STEREO, - { - ATRAC9_BLOCK_TYPE_SCE, - ATRAC9_BLOCK_TYPE_SCE, - }, - { { 0 }, { 1 }, }, - 2, + .channel_layout = AV_CH_LAYOUT_STEREO, + .type = { ATRAC9_BLOCK_TYPE_SCE, + ATRAC9_BLOCK_TYPE_SCE, }, + .plane_map = { { 0 }, { 1 }, }, + .count = 2, }, { /* Stereo */ - AV_CH_LAYOUT_STEREO, - { - ATRAC9_BLOCK_TYPE_CPE, - }, - { { 0, 1 }, }, - 1, + .channel_layout = AV_CH_LAYOUT_STEREO, + .type = { ATRAC9_BLOCK_TYPE_CPE, }, + .plane_map = { { 0, 1 }, }, + .count = 1, }, { /* 5.1 */ - AV_CH_LAYOUT_5POINT1, - { - ATRAC9_BLOCK_TYPE_CPE, - ATRAC9_BLOCK_TYPE_SCE, - ATRAC9_BLOCK_TYPE_LFE, - ATRAC9_BLOCK_TYPE_CPE, - }, - { { 0, 1 }, { 2 }, { 3 }, { 4, 5 }, }, - 4, + .channel_layout = AV_CH_LAYOUT_5POINT1, + .type = { ATRAC9_BLOCK_TYPE_CPE, + ATRAC9_BLOCK_TYPE_SCE, + ATRAC9_BLOCK_TYPE_LFE, + ATRAC9_BLOCK_TYPE_CPE, }, + .plane_map = { { 0, 1 }, { 2 }, { 3 }, { 4, 5 }, }, + .count = 4, }, - { /* 5.1 */ - AV_CH_LAYOUT_7POINT1, - { - ATRAC9_BLOCK_TYPE_CPE, - ATRAC9_BLOCK_TYPE_SCE, - ATRAC9_BLOCK_TYPE_LFE, - ATRAC9_BLOCK_TYPE_CPE, - ATRAC9_BLOCK_TYPE_CPE, - }, - { { 0, 1 }, { 2 }, { 3 }, { 4, 5 }, { 6, 7 }, }, - 5, + { /* 7.1 */ + .channel_layout = AV_CH_LAYOUT_7POINT1, + .type = { ATRAC9_BLOCK_TYPE_CPE, + ATRAC9_BLOCK_TYPE_SCE, + ATRAC9_BLOCK_TYPE_LFE, + ATRAC9_BLOCK_TYPE_CPE, + ATRAC9_BLOCK_TYPE_CPE, }, + .plane_map = { { 0, 1 }, { 2 }, { 3 }, { 4, 5 }, { 6, 7 }, }, + .count = 5, }, { /* Quad */ - AV_CH_LAYOUT_QUAD, - { - ATRAC9_BLOCK_TYPE_CPE, - ATRAC9_BLOCK_TYPE_CPE, - }, - { { 0, 1 }, { 2, 3 }, }, - 2, + .channel_layout = AV_CH_LAYOUT_QUAD, + .type = { ATRAC9_BLOCK_TYPE_CPE, + ATRAC9_BLOCK_TYPE_CPE, }, + .plane_map = { { 0, 1 }, { 2, 3 }, }, + .count = 2, }, }; |