* Stringreview !!!

[vlc] / modules / demux / avi / avi.h

diff --git a/modules/demux/avi/avi.h b/modules/demux/avi/avi.h
index c77973f4ecbd692f2b70b2b975a88be30192e18c..146cba9660eac3360797f636f1770fc0d2f4281d 100644 (file)
--- a/modules/demux/avi/avi.h
+++ b/modules/demux/avi/avi.h
@@ -1,8 +1,8 @@
 /*****************************************************************************
  * avi.h : AVI file Stream input module for vlc
  *****************************************************************************
- * Copyright (C) 2001 VideoLAN
- * $Id: avi.h,v 1.10 2003/05/03 01:12:13 fenrir Exp $
+ * Copyright (C) 2001-2004 VideoLAN
+ * $Id: avi.h,v 1.19 2004/01/25 20:05:28 hartman Exp $
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -25,9 +25,9 @@ typedef struct avi_packet_s
     vlc_fourcc_t i_fourcc;
     off_t        i_pos;
     uint32_t     i_size;
-    vlc_fourcc_t i_type;     // only for AVIFOURCC_LIST
+    vlc_fourcc_t i_type;     /* only for AVIFOURCC_LIST */
 
-    uint8_t      i_peek[8];  //first 8 bytes
+    uint8_t      i_peek[8];  /* first 8 bytes */
 
     unsigned int i_stream;
     unsigned int i_cat;
@@ -44,19 +44,18 @@ typedef struct AVIIndexEntry_s
 
 } AVIIndexEntry_t;
 
-typedef struct avi_stream_s
+typedef struct
 {
     vlc_bool_t      b_activated;
 
     unsigned int    i_cat; /* AUDIO_ES, VIDEO_ES */
-    vlc_fourcc_t    i_fourcc;
     vlc_fourcc_t    i_codec;
 
     int             i_rate;
     int             i_scale;
     int             i_samplesize;
 
-    es_descriptor_t     *p_es;
+    es_out_id_t     *p_es;
 
     AVIIndexEntry_t     *p_index;
     unsigned int        i_idxnb;
@@ -65,7 +64,10 @@ typedef struct avi_stream_s
     unsigned int        i_idxposc;  /* numero of chunk */
     unsigned int        i_idxposb;  /* byte in the current chunk */
 
-} avi_stream_t;
+    /* For VBR audio only */
+    unsigned int        i_blockno;
+    unsigned int        i_blocksize;
+} avi_track_t;
 
 struct demux_sys_t
 {
@@ -79,15 +81,10 @@ struct demux_sys_t
     vlc_bool_t  b_odml;
 
     off_t   i_movi_begin;
-    off_t   i_movi_lastchunk_pos; /* XXX position of last valid chunk */
+    off_t   i_movi_lastchunk_pos;   /* XXX position of last valid chunk */
 
     /* number of streams and information */
-    unsigned int i_streams;
-    avi_stream_t  **pp_info;
-
-#ifdef __AVI_SUBTITLE__
-    subtitle_demux_t    *p_sub;
-#endif
-
+    unsigned int i_track;
+    avi_track_t  **track;
 };