[vlc-devel] commit: RTP/PS: fix crash at exit ( Rémi Denis-Courmont )

git version control git at videolan.org
Thu Jun 25 20:13:53 CEST 2009


vlc | branch: 0.9-bugfix | Rémi Denis-Courmont <remi at remlab.net> | Wed Jun 24 19:49:32 2009 +0300| [4afa4672a6c8f7f256da0dc01b2b2e74c4290982] | committer: Rémi Denis-Courmont 

RTP/PS: fix crash at exit

(Rtp)Add then MuxAdd, so MuxDel before (Rtp)Del. Indeed, the PS muxer
sends packets when it's deleted, so the RTP stream is still needed.
(cherry picked from commit 816f557325f3ee631fb3a328ff7b30c46c634585)

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

 modules/stream_out/rtp.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c
index 0efd738..9d5a738 100644
--- a/modules/stream_out/rtp.c
+++ b/modules/stream_out/rtp.c
@@ -564,10 +564,11 @@ static void Close( vlc_object_t * p_this )
     if( p_sys->p_mux )
     {
         assert( p_sys->i_es == 1 );
-        Del( p_stream, p_sys->es[0] );
 
         sout_MuxDelete( p_sys->p_mux );
+        Del( p_stream, p_sys->es[0] );
         sout_AccessOutDelete( p_sys->p_grab );
+
         if( p_sys->packet )
         {
             block_Release( p_sys->packet );




More information about the vlc-devel mailing list