Ogg: no tabs in source-code

[vlc] / modules / demux / live555.cpp

diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp
index 2b2e4a67a1741448c6b5a1a2460f26f2a63e3048..18ff67cc52fd1ab1714aa5980c0efc143378c856 100644 (file)
--- a/modules/demux/live555.cpp
+++ b/modules/demux/live555.cpp
@@ -99,18 +99,13 @@ vlc_module_begin ()
     set_capability( "demux", 50 )
     set_shortname( "RTP/RTSP")
     set_callbacks( Open, Close )
-    add_shortcut( "live" )
-    add_shortcut( "livedotcom" )
+    add_shortcut( "live", "livedotcom" )
     set_category( CAT_INPUT )
     set_subcategory( SUBCAT_INPUT_DEMUX )
 
     add_submodule ()
         set_description( N_("RTSP/RTP access and demux") )
-        add_shortcut( "rtsp" )
-        add_shortcut( "pnm" )
-        add_shortcut( "sdp" )
-        add_shortcut( "live" )
-        add_shortcut( "livedotcom" )
+        add_shortcut( "rtsp", "pnm", "sdp", "live", "livedotcom" )
         set_capability( "access_demux", 0 )
         set_callbacks( Open, Close )
         add_bool( "rtsp-tcp", false, NULL,
@@ -302,7 +297,7 @@ static int  Open ( vlc_object_t *p_this )
     p_sys->b_timeout_call = false;
     p_sys->b_multicast = false;
     p_sys->b_real = false;
-    p_sys->psz_path = strdup( p_demux->psz_path );
+    p_sys->psz_path = strdup( p_demux->psz_location );
     p_sys->b_force_mcast = var_CreateGetBool( p_demux, "rtsp-mcast" );
     p_sys->b_get_param = false;
     p_sys->b_paused = false;
@@ -427,9 +422,13 @@ static void Close( vlc_object_t *p_this )
 {
     demux_t *p_demux = (demux_t*)p_this;
     demux_sys_t *p_sys = p_demux->p_sys;
-    int i;
 
-    for( i = 0; i < p_sys->i_track; i++ )
+    if( p_sys->rtsp && p_sys->ms ) p_sys->rtsp->teardownMediaSession( *p_sys->ms );
+    if( p_sys->ms ) Medium::close( p_sys->ms );
+    if( p_sys->rtsp ) RTSPClient::close( p_sys->rtsp );
+    if( p_sys->env ) p_sys->env->reclaim();
+
+    for( int i = 0; i < p_sys->i_track; i++ )
     {
         live_track_t *tk = p_sys->track[i];
 
@@ -441,16 +440,12 @@ static void Close( vlc_object_t *p_this )
 
     if( p_sys->i_track ) free( p_sys->track );
     if( p_sys->p_out_asf ) stream_Delete( p_sys->p_out_asf );
-    if( p_sys->rtsp && p_sys->ms ) p_sys->rtsp->teardownMediaSession( *p_sys->ms );
     if( p_sys->p_timeout )
     {
         vlc_cancel( p_sys->p_timeout->handle );
         vlc_join( p_sys->p_timeout->handle, NULL );
         free( p_sys->p_timeout );
     }
-    if( p_sys->ms ) Medium::close( p_sys->ms );
-    if( p_sys->rtsp ) RTSPClient::close( p_sys->rtsp );
-    if( p_sys->env ) p_sys->env->reclaim();
     delete p_sys->scheduler;
     free( p_sys->p_sdp );
     free( p_sys->psz_path );
@@ -913,6 +908,7 @@ static int SessionsSetup( demux_t *p_demux )
                 if( !strcmp( sub->codecName(), "MPV" ) )
                 {
                     tk->fmt.i_codec = VLC_CODEC_MPGV;
+                    tk->fmt.b_packetized = false;
                 }
                 else if( !strcmp( sub->codecName(), "H263" ) ||
                          !strcmp( sub->codecName(), "H263-1998" ) ||
@@ -1480,7 +1476,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
 
         case DEMUX_GET_PTS_DELAY:
             pi64 = (int64_t*)va_arg( args, int64_t * );
-            *pi64 = (int64_t)var_GetInteger( p_demux, "rtsp-caching" ) * 1000;
+            *pi64 = var_GetInteger( p_demux, "rtsp-caching" ) * 1000;
             return VLC_SUCCESS;
 
         default:
@@ -1630,7 +1626,7 @@ static block_t *StreamParseAsf( demux_t *p_demux, live_track_t *tk,
         else
         {
             /* Reset on broken stream */
-            msg_Err( p_demux, "Broken packet detected (%d vs %d or %d + %d vs %d)",
+            msg_Err( p_demux, "Broken packet detected (%d vs %zu or %d + %d vs %d)",
                      i_offset, tk->p_asf_block->i_buffer, i_offset, i_payload, i_packet_size);
             tk->p_asf_block->i_buffer = 0;
         }