Contrib: upnp/win32, remove strerror use, and other small hacks...

[vlc] / modules / demux / live555.cpp

diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp
index 79ac789846d8aeaa5881e45254930422b3dad346..18ff67cc52fd1ab1714aa5980c0efc143378c856 100644 (file)
--- a/modules/demux/live555.cpp
+++ b/modules/demux/live555.cpp
@@ -297,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;
@@ -1476,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:
@@ -1626,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;
         }