overlay_vulkan: add support for overlaying images with an alpha channel

[ffmpeg] / libavcodec / atrac9tab.h

diff --git a/libavcodec/atrac9tab.h b/libavcodec/atrac9tab.h
index d25c6f1b7fae3b7e08f9317f9498da34049a9eb1..8f290f158c1832d7aeb2181a3f67b7e39a0608b9 100644 (file)
--- 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,
     },
 };