Rémi Bernon : winegstreamer: Reorder video format struct in wg_format.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: c185b5a9660140da6716362698cc8b669690d8ac
URL:    https://gitlab.winehq.org/wine/wine/-/commit/c185b5a9660140da6716362698cc8b6...

Author: Rémi Bernon 
Date:   Mon Sep 26 12:44:08 2022 +0200

winegstreamer: Reorder video format struct in wg_format.

---

dlls/winegstreamer/unixlib.h | 57 ++++++++++++++++++++++----------------------
 1 file changed, 29 insertions(+), 28 deletions(-)

diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h
index 07f2962f755..8e6c5e4cc0e 100644
--- a/dlls/winegstreamer/unixlib.h
+++ b/dlls/winegstreamer/unixlib.h
@@ -34,41 +34,17 @@ struct wg_format
 {
     enum wg_major_type
     {
-        WG_MAJOR_TYPE_UNKNOWN,
-        WG_MAJOR_TYPE_VIDEO,
-        WG_MAJOR_TYPE_VIDEO_CINEPAK,
-        WG_MAJOR_TYPE_VIDEO_H264,
+        WG_MAJOR_TYPE_UNKNOWN = 0,
         WG_MAJOR_TYPE_AUDIO,
         WG_MAJOR_TYPE_AUDIO_MPEG1,
         WG_MAJOR_TYPE_AUDIO_WMA,
+        WG_MAJOR_TYPE_VIDEO,
+        WG_MAJOR_TYPE_VIDEO_CINEPAK,
+        WG_MAJOR_TYPE_VIDEO_H264,
     } major_type;

union
     {
-        struct
-        {
-            enum wg_video_format
-            {
-                WG_VIDEO_FORMAT_UNKNOWN,
-
-                WG_VIDEO_FORMAT_BGRA,
-                WG_VIDEO_FORMAT_BGRx,
-                WG_VIDEO_FORMAT_BGR,
-                WG_VIDEO_FORMAT_RGB15,
-                WG_VIDEO_FORMAT_RGB16,
-
-                WG_VIDEO_FORMAT_AYUV,
-                WG_VIDEO_FORMAT_I420,
-                WG_VIDEO_FORMAT_NV12,
-                WG_VIDEO_FORMAT_UYVY,
-                WG_VIDEO_FORMAT_YUY2,
-                WG_VIDEO_FORMAT_YV12,
-                WG_VIDEO_FORMAT_YVYU,
-            } format;
-            int32_t width, height;
-            uint32_t fps_n, fps_d;
-            RECT padding;
-        } video;
         struct
         {
             enum wg_audio_format
@@ -104,6 +80,31 @@ struct wg_format
             uint32_t codec_data_len;
             unsigned char codec_data[64];
         } audio_wma;
+
+        struct
+        {
+            enum wg_video_format
+            {
+                WG_VIDEO_FORMAT_UNKNOWN,
+
+                WG_VIDEO_FORMAT_BGRA,
+                WG_VIDEO_FORMAT_BGRx,
+                WG_VIDEO_FORMAT_BGR,
+                WG_VIDEO_FORMAT_RGB15,
+                WG_VIDEO_FORMAT_RGB16,
+
+                WG_VIDEO_FORMAT_AYUV,
+                WG_VIDEO_FORMAT_I420,
+                WG_VIDEO_FORMAT_NV12,
+                WG_VIDEO_FORMAT_UYVY,
+                WG_VIDEO_FORMAT_YUY2,
+                WG_VIDEO_FORMAT_YV12,
+                WG_VIDEO_FORMAT_YVYU,
+            } format;
+            int32_t width, height;
+            uint32_t fps_n, fps_d;
+            RECT padding;
+        } video;
         struct
         {
             uint32_t width;