[vlc-devel] commit: Cosmetics. (Laurent Aimar )

[git version control]

vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Mon Dec  1 23:19:12 2008 +0100| [0432a0e58128e028233828671fdc842d4c9bf93e] | committer: Laurent Aimar 

Cosmetics.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0432a0e58128e028233828671fdc842d4c9bf93e
---

 src/input/demux.h |    4 ++--
 src/input/input.c |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/input/demux.h b/src/input/demux.h
index 77ea695..084185f 100644
--- a/src/input/demux.h
+++ b/src/input/demux.h
@@ -36,9 +36,9 @@
 
 /* stream_t *s could be null and then it mean a access+demux in one */
 #define demux_New( a, b, c, d, e, f,g ) __demux_New(VLC_OBJECT(a),b,c,d,e,f,g)
-demux_t *__demux_New(vlc_object_t *p_obj, const char *psz_access, const char *psz_demux, const char *psz_path, stream_t *s, es_out_t *out, bool );
+demux_t *__demux_New( vlc_object_t *p_obj, const char *psz_access, const char *psz_demux, const char *psz_path, stream_t *s, es_out_t *out, bool );
 
-void demux_Delete(demux_t *);
+void demux_Delete( demux_t * );
 
 static inline int demux_Demux( demux_t *p_demux )
 {
diff --git a/src/input/input.c b/src/input/input.c
index 5430237..7a29981 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -560,7 +560,7 @@ static void MainLoopDemux( input_thread_t *p_input, bool *pb_changed, mtime_t *p
         ( p_input->p->i_run > 0 && *pi_start_mdate+p_input->p->i_run < mdate() ) )
         i_ret = 0; /* EOF */
     else
-        i_ret = p_input->p->input.p_demux->pf_demux(p_input->p->input.p_demux);
+        i_ret = demux_Demux( p_input->p->input.p_demux );
 
     if( i_ret > 0 )
     {
@@ -2650,13 +2650,13 @@ static void SlaveDemux( input_thread_t *p_input )
                 if( i_stime >= i_time )
                     break;
 
-                if( ( i_ret = in->p_demux->pf_demux( in->p_demux ) ) <= 0 )
+                if( ( i_ret = demux_Demux( in->p_demux ) ) <= 0 )
                     break;
             }
         }
         else
         {
-            i_ret = in->p_demux->pf_demux( in->p_demux );
+            i_ret = demux_Demux( in->p_demux );
         }
 
         if( i_ret <= 0 )