Rename linked_with_a_crap_library_which_uses_atexit()

[vlc] / include / vlc_picture.h

diff --git a/include/vlc_picture.h b/include/vlc_picture.h
index a97048f2c67bc634de5d697b870558ae46be03a0..458bb2b32e0da7e7f5af98f8b6ee5c9b55902e4a 100644 (file)
--- a/include/vlc_picture.h
+++ b/include/vlc_picture.h
@@ -106,17 +106,13 @@ 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 */
     /**@}*/
 
-    /* Some vouts require the picture to be locked before it can be modified */
-    int (* pf_lock) ( vout_thread_t *, picture_t * );
-    int (* pf_unlock) ( vout_thread_t *, picture_t * );
-
     /** Private data - the video output plugin might want to put stuff here to
      * keep track of the picture */
     picture_sys_t * p_sys;