[vlc-commits] commit: Write new ASF header on the fly only in HTTP mode. (Laurent Aimar )

git at videolan.org git at videolan.org
Sat May 1 13:47:57 CEST 2010


vlc/vlc-1.1 | branch: master | Laurent Aimar <fenrir at videolan.org> | Sat May  1 13:20:32 2010 +0200| [d4d55d282d10ac257bef5a9b97354817c5a955e5] | committer: Jean-Baptiste Kempf 

Write new ASF header on the fly only in HTTP mode.
(cherry picked from commit 8e2ba632c6ab8b424213835baf16fdde7e8a1c4d)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/mux/asf.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/mux/asf.c b/modules/mux/asf.c
index 165edfb..8d78a69 100644
--- a/modules/mux/asf.c
+++ b/modules/mux/asf.c
@@ -629,7 +629,8 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
     tk->i_id = vlc_array_index_of_item( p_sys->p_tracks, tk ) + 1;
 
 
-    p_sys->b_write_header = true;
+    if( p_sys->b_asf_http )
+        p_sys->b_write_header = true;
 
     return VLC_SUCCESS;
 }
@@ -663,10 +664,10 @@ static int DelStream( sout_mux_t *p_mux, sout_input_t *p_input )
     }
 
     if( p_sys->b_asf_http )
+    {
         vlc_array_remove( p_sys->p_tracks, vlc_array_index_of_item( p_sys->p_tracks, (void *)tk ) );
-
-
-    p_sys->b_write_header = true;
+        p_sys->b_write_header = true;
+    }
     return VLC_SUCCESS;
 }
 



More information about the vlc-commits mailing list