MKV: use key-action

[vlc] / modules / demux / live555.cpp

diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp
index ce52ecd1e62be062272e42a4b08a9e99f561c91e..ea58cca32f1a0ec677de5911f9bb964cfb70b998 100644 (file)
--- a/modules/demux/live555.cpp
+++ b/modules/demux/live555.cpp
@@ -530,7 +530,7 @@ describe:
 
     psz_options = p_sys->rtsp->sendOptionsCmd( psz_url, psz_user, psz_pwd,
                                                &authenticator );
-    if( psz_options ) delete [] psz_options;
+    delete [] psz_options;
 
     p_sdp = p_sys->rtsp->describeURL( psz_url, &authenticator,
                          var_GetBool( p_demux, "rtsp-kasenna" ) );
@@ -1374,7 +1374,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
             double d_npt = (double) p_sys->i_npt / I64C(1000000);
             int i;
 
-            b_bool = (vlc_bool_t)va_arg( args, vlc_bool_t );
+            b_bool = (bool)va_arg( args, int );
             if( p_sys->rtsp == NULL )
                 return VLC_EGENERIC;