@@ -21,28 +21,6 @@

            VLC_ADD_PLUGIN(mod)

            VLC_ADD_CXXFLAGS(mod,$LIBMODPLUG_CFLAGS)

            VLC_ADD_CFLAGS(mod,$LIBMODPLUG_CFLAGS) #modules/demux/mod.c needs CFLAGS_mod, not CXXFLAGS_mod

---- a/modules/access/live555.cpp

-+++ b/modules/access/live555.cpp

-@@ -60,6 +60,7 @@

- #include <liveMedia.hh>

- #include <liveMedia_version.hh>

- #include <Base64.hh>

-+#include <NetAddress.hh>

- 

- extern "C" {

- #include "../access/mms/asf.h"  /* Who said ugly ? */

-@@ -859,8 +860,10 @@ static int SessionsSetup( demux_t *p_dem

-             if( sub->readSource() == NULL ) continue;

-             if( !p_sys->b_multicast )

-             {

-+                struct sockaddr_storage addr;

-                 /* We need different rollover behaviour for multicast */

--                p_sys->b_multicast = IsMulticastAddress( sub->connectionEndpointAddress() );

-+                sub->getConnectionEndpointAddress( addr );

-+                p_sys->b_multicast = IsMulticastAddress( addr );

-             }

- 

-             tk = (live_track_t*)malloc( sizeof( live_track_t ) );

 --- a/modules/control/cli/cli.c

 +++ b/modules/control/cli/cli.c

 @@ -529,9 +529,8 @@ static void cli_client_delete(struct cli

​