* Fixed a few warnings with gcc 3.0.

[vlc] / include / vpar_headers.h

diff --git a/include/vpar_headers.h b/include/vpar_headers.h
index 6b27a1f1af8cd268f608c1c9ee5fef76516923cd..4b321b1d39f20a44d67a2b138f869136b040e2c1 100644 (file)
--- a/include/vpar_headers.h
+++ b/include/vpar_headers.h
@@ -2,8 +2,10 @@
  * vpar_headers.h : video parser : headers parsing
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
+ * $Id: vpar_headers.h,v 1.26 2001/05/06 04:32:02 sam Exp $
  *
- * Authors:
+ * Authors: Christophe Massiot <massiot@via.ecp.fr>
+ *          Stéphane Borel <stef@via.ecp.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -38,7 +40,7 @@
  *****************************************************************************/
 typedef struct quant_matrix_s
 {
-    int *       pi_matrix;
+    u8 *        pi_matrix;
     boolean_t   b_allocated;
                           /* Has the matrix been allocated by vpar_headers ? */
 } quant_matrix_t;
@@ -58,7 +60,7 @@ typedef struct sequence_s
                                             /* the same, in macroblock units */
     unsigned int        i_aspect_ratio;        /* height/width display ratio */
     unsigned int        i_matrix_coefficients;/* coeffs of the YUV transform */
-    float               r_frame_rate;       /* theoritical frame rate in fps */
+    int                 i_frame_rate;  /* theoritical frame rate in fps*1001 */
     boolean_t           b_mpeg2;                                    /* guess */
     boolean_t           b_progressive;              /* progressive (ie.
                                                      * non-interlaced) frame */
@@ -80,6 +82,10 @@ typedef struct sequence_s
     /* Parser context */
     picture_t *         p_forward;        /* current forward reference frame */
     picture_t *         p_backward;      /* current backward reference frame */
+    mtime_t             next_pts, next_dts;
+    int                 i_current_rate;
+    boolean_t           b_expect_discontinuity; /* reset the frame predictors
+                                                 * after the current frame   */
 
     /* Copyright extension */
     boolean_t           b_copyright_flag;     /* Whether the following
@@ -107,7 +113,7 @@ typedef struct picture_parsing_s
     int                 i_intra_dc_precision;
     boolean_t           b_frame_pred_frame_dct, b_q_scale_type;
     boolean_t           b_intra_vlc_format;
-    boolean_t           b_alternate_scan, b_progressive_frame;
+    boolean_t           b_alternate_scan, b_progressive;
     boolean_t           b_top_field_first, b_concealment_mv;
     boolean_t           b_repeat_first_field;
     /* Relative to the current field */