coding style

modules/access/pvr/pvr.c

@@ -2,7 +2,7 @@
  * pvr.c
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: pvr.c,v 1.12 2004/02/20 15:38:40 bigben Exp $
+ * $Id: pvr.c,v 1.13 2004/02/20 16:29:31 bigben Exp $
  *
  * Authors: Eric Petit <titer@videolan.org>
  *
@@ -130,7 +130,7 @@ static int Open( vlc_object_t * p_this )
     p_sys->i_standard = V4L2_STD_UNKNOWN;
     p_sys->i_width = -1;
     p_sys->i_height = -1;
-    p_sys->i_frequency = -1; /* M6 ;) */
+    p_sys->i_frequency = -1; 
     p_sys->i_framerate = -1;
     p_sys->i_bitrate = -1;
     p_sys->i_bitrate_peak = -1;
@@ -302,7 +302,9 @@ static int Open( vlc_object_t * p_this )
         return VLC_EGENERIC;
     }
     else
+    {
         msg_Dbg( p_input, "using video device: %s",psz_device);
+    }
 
     free( psz_device );
     
@@ -314,8 +316,10 @@ static int Open( vlc_object_t * p_this )
 	        msg_Warn( p_input, "VIDIOC_S_INPUT failed" );
 	    }
 	    else
+        {
 	        msg_Dbg( p_input,"input set to:%d",p_sys->i_input);
         }
+    }
       
       /* set the video standard */
     if(p_sys->i_standard != V4L2_STD_UNKNOWN)
@@ -325,8 +329,10 @@ static int Open( vlc_object_t * p_this )
 	        msg_Warn( p_input, "VIDIOC_S_STD failed" );
 	    }
 	    else
+        {
 	        msg_Dbg( p_input,"video standard set to:%x",p_sys->i_standard);
         }
+	}
 
       /* set the picture size */
     if(p_sys->i_width != -1 || p_sys->i_height != -1)
@@ -338,10 +344,14 @@ static int Open( vlc_object_t * p_this )
 	    else
 	    {
 	        if(p_sys->i_width != -1)
+            {
 		        vfmt.fmt.pix.width = p_sys->i_width;
+            }
 	      
 	        if(p_sys->i_height != -1)
+            {
 		        vfmt.fmt.pix.height = p_sys->i_height;
+	        }
 
 	        if( ioctl( p_sys->i_fd, VIDIOC_S_FMT, &vfmt ) < 0 )
 		    {
@@ -382,17 +392,14 @@ static int Open( vlc_object_t * p_this )
         if(p_sys->i_framerate != -1 
 	        || p_sys->i_bitrate_mode != -1 
 	        || p_sys->i_bitrate_peak != -1
-	 || p_sys->i_bitrate != -1
-	 )
+	        || p_sys->i_bitrate != -1)
 	    {
-	  
 	        if( ioctl( p_sys->i_fd, IVTV_IOC_G_CODEC, &codec ) < 0 )
 	        {
 	            msg_Warn( p_input, "IVTV_IOC_G_CODEC failed" );
 	        }
 	    else
 	    {
-	      
 	        if(p_sys->i_framerate != -1)
 		    {
 		        switch( p_sys->i_framerate )
@@ -413,13 +420,19 @@ static int Open( vlc_object_t * p_this )
 		    }
 
 	        if(p_sys->i_bitrate != -1)
+            {
 		        codec.bitrate = p_sys->i_bitrate;
+            }
 
 	        if(p_sys->i_bitrate_peak != -1)
+            {
 		        codec.bitrate_peak = p_sys->i_bitrate_peak;
+            }
 
 	        if(p_sys->i_bitrate_mode != -1)
+            {
 		        codec.bitrate_mode = p_sys->i_bitrate_mode;
+            }
 
 	        if( ioctl( p_sys->i_fd, IVTV_IOC_S_CODEC, &codec ) < 0 )
 		    {