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 321977189506dc29284f28e20fcac02601508f88..407d4ca6a4007d450277bb094de8b72c654188d3 100644 (file)
--- a/modules/mux/mpeg/bits.h
+++ b/modules/mux/mpeg/bits.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * bits.h
  *****************************************************************************
- * Copyright (C) 2001, 2002 VideoLAN
+ * Copyright (C) 2001, 2002 the VideoLAN team
  * $Id$
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -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
@@ -43,18 +43,9 @@ static inline int bits_initwrite( bits_buffer_t *p_buffer,
     if( !p_buffer->p_data )
     {
         if( !( p_buffer->p_data = malloc( i_size ) ) )
-        {
-            return( -1 );
-        }
-        else
-        {
-            return( 0 );
-        }
-    }
-    else
-    {
-        return( 0 );
+            return -1;
     }
+    return 0;
 }
 
 static inline void bits_align( bits_buffer_t *p_buffer )