diff stream/stream.c @ 29263:0f1b5b68af32

whitespace cosmetics: Remove all trailing whitespace.
author diego
date Wed, 13 May 2009 02:58:57 +0000
parents c884d17bd005
children d133a1a83c17
line wrap: on
line diff
--- a/stream/stream.c	Tue May 12 19:25:35 2009 +0000
+++ b/stream/stream.c	Wed May 13 02:58:57 2009 +0000
@@ -130,13 +130,13 @@
   if(desc) {
     arg = m_struct_alloc(desc);
     if(sinfo->opts_url) {
-      m_option_t url_opt = 
+      m_option_t url_opt =
 	{ "stream url", arg , CONF_TYPE_CUSTOM_URL, 0, 0 ,0, sinfo->opts };
       if(m_option_parse(&url_opt,"stream url",filename,arg,M_CONFIG_FILE) < 0) {
 	mp_msg(MSGT_OPEN,MSGL_ERR, "URL parsing failed on url %s\n",filename);
 	m_struct_free(desc,arg);
 	return NULL;
-      }	
+      }
     }
     if(options) {
       int i;
@@ -174,14 +174,14 @@
     s->flags &= ~STREAM_SEEK;
   if(s->seek && !(s->flags & STREAM_SEEK))
     s->flags |= STREAM_SEEK;
-  
+
   s->mode = mode;
 
   mp_msg(MSGT_OPEN,MSGL_V, "STREAM: [%s] %s\n",sinfo->name,filename);
   mp_msg(MSGT_OPEN,MSGL_V, "STREAM: Description: %s\n",sinfo->info);
   mp_msg(MSGT_OPEN,MSGL_V, "STREAM: Author: %s\n", sinfo->author);
   mp_msg(MSGT_OPEN,MSGL_V, "STREAM: Comment: %s\n", sinfo->comment);
-  
+
   return s;
 }
 
@@ -257,9 +257,9 @@
   case STREAMTYPE_DS:
     len = demux_read_data((demux_stream_t*)s->priv,s->buffer,STREAM_BUFFER_SIZE);
     break;
-  
-    
-  default: 
+
+
+  default:
     len= s->fill_buffer ? s->fill_buffer(s,s->buffer,STREAM_BUFFER_SIZE) : 0;
   }
   if(len<=0){ s->eof=1; s->buf_pos=s->buf_len=0; return 0; }
@@ -320,13 +320,13 @@
       }
       break;
     }
-	
+
     if( s->streaming_ctrl!=NULL && s->streaming_ctrl->streaming_seek ) {
       if( s->streaming_ctrl->streaming_seek( s->fd, pos, s->streaming_ctrl )<0 ) {
         mp_msg(MSGT_STREAM,MSGL_INFO,"Stream not seekable!\n");
         return 1;
       }
-    } 
+    }
 #else
     if(newpos<s->pos){
       mp_msg(MSGT_STREAM,MSGL_INFO,"Cannot seek backward in linear streams!\n");
@@ -359,9 +359,9 @@
   }
   pos -= s->buf_len;
 }
-  
+
 //  if(pos==s->buf_len) printf("XXX Seek to last byte of file -> EOF\n");
-  
+
   mp_msg(MSGT_STREAM,MSGL_V,"stream_seek: WARNING! Can't seek to 0x%"PRIX64" !\n",(int64_t)(pos+newpos));
   return 0;
 }
@@ -415,7 +415,7 @@
     mp_msg(MSGT_STREAM,MSGL_V,"WINSOCK2 init: %i\n", temp);
   }
 #endif
-  
+
   s->fd=fd;
   s->type=type;
   s->buf_pos=s->buf_len=0;