Non-working general declarations for disc probing (Refs:#565)

[vlc] / include / vlc_es.h

diff --git a/include/vlc_es.h b/include/vlc_es.h
index e1fe3eef25708dcf98cd31be0abd983f0586774b..5cf15bc15700ec69a237cb7e0e308ffdc86568fb 100644 (file)
--- a/include/vlc_es.h
+++ b/include/vlc_es.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * vlc_es.h: Elementary stream formats descriptions
  *****************************************************************************
- * Copyright (C) 1999-2001 VideoLAN
+ * Copyright (C) 1999-2001 the VideoLAN team
  * $Id$
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef _VLC_ES_H
@@ -61,7 +61,7 @@ struct audio_format_t
     unsigned int i_bytes_per_frame;
 
     /* Number of sampleframes contained in one compressed frame. */
-    unsigned int        i_frame_length;
+    unsigned int i_frame_length;
     /* Please note that it may be completely arbitrary - buffers are not
      * obliged to contain a integral number of so-called "frames". It's
      * just here for the division :
@@ -128,9 +128,9 @@ struct subs_format_t
         uint32_t palette[16+1];
 
         /* the width of the original movie the spu was extracted from */
-        int    i_original_frame_width;
+        int i_original_frame_width;
         /* the height of the original movie the spu was extracted from */
-        int    i_original_frame_height;
+        int i_original_frame_height;
     } spu;
 
     struct
@@ -163,7 +163,7 @@ struct es_format_t
     video_format_t video;
     subs_format_t  subs;
 
-    int            i_bitrate;
+    unsigned int   i_bitrate;
 
     vlc_bool_t     b_packetized; /* wether the data is packetized
                                     (ie. not truncated) */