Removes trailing spaces. Removes tabs.

[vlc] / modules / mux / mpeg / bits.h

diff --git a/modules/mux/mpeg/bits.h b/modules/mux/mpeg/bits.h
index 05f730431c6f6d600302d245a763cb46d0ec16fc..407d4ca6a4007d450277bb094de8b72c654188d3 100644 (file)
--- a/modules/mux/mpeg/bits.h
+++ b/modules/mux/mpeg/bits.h
@@ -1,8 +1,8 @@
 /*****************************************************************************
  * bits.h
  *****************************************************************************
- * Copyright (C) 2001, 2002 VideoLAN
- * $Id: bits.h,v 1.3 2003/01/08 10:34:58 fenrir Exp $
+ * Copyright (C) 2001, 2002 the VideoLAN team
+ * $Id$
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *          Eric Petit <titer@videolan.org>
@@ -11,7 +11,7 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -19,7 +19,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.
  *****************************************************************************/
 
 typedef struct bits_buffer_s
@@ -31,8 +31,8 @@ typedef struct bits_buffer_s
     uint8_t *p_data;
 
 } bits_buffer_t;
- 
-static inline int bits_initwrite( bits_buffer_t *p_buffer, 
+
+static inline int bits_initwrite( bits_buffer_t *p_buffer,
                                   int i_size, void *p_data )
 {
     p_buffer->i_size = i_size;
@@ -41,20 +41,11 @@ static inline int bits_initwrite( bits_buffer_t *p_buffer,
     p_buffer->p_data = p_data;
     p_buffer->p_data[0] = 0;
     if( !p_buffer->p_data )
-    {   
-        if( !( p_buffer->p_data = malloc( i_size ) ) )
-        {        
-            return( -1 );
-        }
-        else
-        {
-            return( 0 );
-        }
-    }
-    else
     {
-        return( 0 );
+        if( !( p_buffer->p_data = malloc( i_size ) ) )
+            return -1;
     }
+    return 0;
 }
 
 static inline void bits_align( bits_buffer_t *p_buffer )
@@ -67,12 +58,14 @@ static inline void bits_align( bits_buffer_t *p_buffer )
     }
 }
 
-static inline void bits_write( bits_buffer_t *p_buffer, 
+static inline void bits_write( bits_buffer_t *p_buffer,
                                int i_count, uint64_t i_bits )
 {
     while( i_count > 0 )
     {
-        if( ( i_bits >> ( i_count - 1 ) )&0x01 )
+        i_count--;
+
+        if( ( i_bits >> i_count )&0x01 )
         {
             p_buffer->p_data[p_buffer->i_data] |= p_buffer->i_mask;
         }
@@ -84,13 +77,8 @@ static inline void bits_write( bits_buffer_t *p_buffer,
         if( p_buffer->i_mask == 0 )
         {
             p_buffer->i_data++;
-            if( p_buffer->i_data < p_buffer->i_size )
-            {
-//                p_buffer->p_data[p_buffer->i_data] = 0;
-                p_buffer->i_mask = 0x80;
-            }
+            p_buffer->i_mask = 0x80;
         }
-        i_count--;
     }
 }