Reorder the Dav1dFrameHeader struct to fix alignment issues

The ar_coeff_shift element needs to have a 16-byte alignment on x86.

1 files changed, 4 insertions, 4 deletions

diff --git a/include/dav1d/headers.h b/include/dav1d/headers.h
index ae323cb..b0c5be7 100644
--- a/include/dav1d/headers.h
+++ b/include/dav1d/headers.h
@@ -329,13 +329,13 @@ typedef struct Dav1dFilmGrainData {
 } Dav1dFilmGrainData;
 
 typedef struct Dav1dFrameHeader {
-    enum Dav1dFrameType frame_type; ///< type of the picture
-    int width[2 /* { coded_width, superresolution_upscaled_width } */], height;
-    int frame_offset; ///< frame number
     struct {
-        int present, update;
         Dav1dFilmGrainData data;
+        int present, update;
     } film_grain; ///< film grain parameters
+    enum Dav1dFrameType frame_type; ///< type of the picture
+    int width[2 /* { coded_width, superresolution_upscaled_width } */], height;
+    int frame_offset; ///< frame number
     int temporal_id, spatial_id; ///< spatial and temporal id of the frame for SVC
 
     int show_existing_frame;