From: Rémi Duraffort <ivoire@videolan.org>
Date: Tue, 22 Dec 2009 14:46:54 +0000 (+0100)
Subject: Fix padding for picture_t and subpicture_t.
X-Git-Tag: 1.1.0-ff~1661
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=8939e8f944fbac079dd9e2d04ca5189a8fed1407;p=vlc

Fix padding for picture_t and subpicture_t.
---

diff --git a/include/vlc_picture.h b/include/vlc_picture.h
index a97048f2c6..b61e4133f2 100644
--- a/include/vlc_picture.h
+++ b/include/vlc_picture.h
@@ -106,8 +106,8 @@ struct picture_t
      * @{
      */
     bool            b_progressive;          /**< is it a progressive frame ? */
-    unsigned int    i_nb_fields;                  /**< # of displayed fields */
     bool            b_top_field_first;             /**< which field is first */
+    unsigned int    i_nb_fields;                  /**< # of displayed fields */
     int8_t         *p_q;                           /**< quantification table */
     int             i_qstride;                    /**< quantification stride */
     int             i_qtype;                       /**< quantification style */
diff --git a/include/vlc_subpicture.h b/include/vlc_subpicture.h
index dea241d267..23fdaaca18 100644
--- a/include/vlc_subpicture.h
+++ b/include/vlc_subpicture.h
@@ -124,6 +124,8 @@ struct subpicture_t
     subpicture_t *  p_next;               /**< next subtitle to be displayed */
     /**@}*/
 
+    subpicture_region_t *p_region;  /**< region list composing this subtitle */
+
     /** \name Date properties */
     /**@{*/
     mtime_t         i_start;                  /**< beginning of display date */
@@ -133,17 +135,15 @@ struct subpicture_t
     bool            b_fade;                               /**< enable fading */
     /**@}*/
 
-    subpicture_region_t *p_region;  /**< region list composing this subtitle */
-
     /** \name Display properties
      * These properties are only indicative and may be
      * changed by the video output thread, or simply ignored depending of the
      * subtitle type. */
     /**@{*/
-    int          i_original_picture_width;  /**< original width of the movie */
-    int          i_original_picture_height;/**< original height of the movie */
     bool         b_subtitle;            /**< the picture is a movie subtitle */
     bool         b_absolute;                       /**< position is absolute */
+    int          i_original_picture_width;  /**< original width of the movie */
+    int          i_original_picture_height;/**< original height of the movie */
     int          i_alpha;                                  /**< transparency */
      /**@}*/