fix MacOS X icon

[vlc] / include / input_ext-dec.h

diff --git a/include/input_ext-dec.h b/include/input_ext-dec.h
index 85c3d5e5d6e3afbc7e9255d1b71436941baa6c35..f4d49df09a5317b362929e89db0624a65d99a083 100644 (file)
--- a/include/input_ext-dec.h
+++ b/include/input_ext-dec.h
@@ -2,7 +2,7 @@
  * input_ext-dec.h: structures exported to the VideoLAN decoders
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: input_ext-dec.h,v 1.23 2001/03/02 03:32:46 stef Exp $
+ * $Id: input_ext-dec.h,v 1.28 2001/04/16 12:34:28 asmax Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Michel Kaempf <maxx@via.ecp.fr>
@@ -33,6 +33,7 @@ typedef struct data_packet_s
 {
     /* Nothing before this line, the code relies on that */
     byte_t *                p_buffer;                     /* raw data packet */
+    long                    l_size;                           /* buffer size */
 
     /* Decoders information */
     byte_t *                p_payload_start;
@@ -164,10 +165,13 @@ typedef struct bit_stream_s
      */
     /* Current data packet (in the current PES packet of the PES stream) */
     data_packet_t *         p_data;
-    /* Pointer to the next byte that is to be read (in the current TS packet) */
+    /* Pointer to the next byte that is to be read (in the current packet) */
     byte_t *                p_byte;
-    /* Pointer to the last byte that is to be read (in the current TS packet */
+    /* Pointer to the last byte that is to be read (in the current packet */
     byte_t *                p_end;
+    /* Temporary buffer in case we're not aligned when changing data packets. */
+    WORD_TYPE               i_showbits_buffer;
+    data_packet_t           showbits_data;
 } bit_stream_t;
 
 /*****************************************************************************
@@ -208,7 +212,7 @@ u32  UnalignedGetBits( struct bit_stream_s *, unsigned int );
  *****************************************************************************/
 static __inline__ void AlignWord( bit_stream_t * p_bit_stream )
 {
-    while( (p_bit_stream->p_byte - p_bit_stream->p_data->p_buffer)
+    while( (ptrdiff_t)p_bit_stream->p_byte
              & (sizeof(WORD_TYPE) - 1) )
     {
         if( p_bit_stream->p_byte < p_bit_stream->p_end )