Cosmetic change.
Signed-off-by: James Almer <jamr...@gmail.com>
---
libavcodec/atrac9tab.h | 79 ++++++++++++++++++------------------------
1 file 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,
},
};
--
2.23.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
