# include "config.h"
#endif
-#include <vlc/vlc.h>
+#ifdef WIN32
+# define _WIN32_WINNT 0x0501
+#endif
+
+#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_sout.h>
#define SOUT_CFG_PREFIX "sout-standard-"
vlc_module_begin();
- set_shortname( _("Standard"));
- set_description( _("Standard stream output") );
+ set_shortname( N_("Standard"));
+ set_description( N_("Standard stream output") );
set_capability( "sout stream", 50 );
add_shortcut( "standard" );
add_shortcut( "std" );
/*****************************************************************************
* Exported prototypes
*****************************************************************************/
-static const char *ppsz_sout_options[] = {
+static const char *const ppsz_sout_options[] = {
"access", "mux", "url", "dst",
"sap", "name", "group", "description", "url", "email", "phone",
"bind", "path", NULL
if( var_GetBool( p_stream, SOUT_CFG_PREFIX"sap" ) )
{
/* Create the SDP */
+ static const struct addrinfo hints = {
+ .ai_family = AF_UNSPEC,
+ .ai_socktype = SOCK_DGRAM,
+ .ai_protocol = 0,
+ .ai_flags = AI_NUMERICHOST | AI_NUMERICSERV
+ };
char *shost = var_GetNonEmptyString (p_access, "src-addr");
char *dhost = var_GetNonEmptyString (p_access, "dst-addr");
int sport = var_GetInteger (p_access, "src-port");
int dport = var_GetInteger (p_access, "dst-port");
+ char port[6];
struct sockaddr_storage src, dst;
socklen_t srclen = 0, dstlen = 0;
-
struct addrinfo *res;
- if (vlc_getaddrinfo (VLC_OBJECT (p_stream), dhost, dport, NULL, &res) == 0)
+
+ snprintf (port, sizeof (port), "%d", dport);
+ if (getaddrinfo (dhost, port, &hints, &res) == 0)
{
memcpy (&dst, res->ai_addr, dstlen = res->ai_addrlen);
- vlc_freeaddrinfo (res);
+ freeaddrinfo (res);
}
- if (vlc_getaddrinfo (VLC_OBJECT (p_stream), shost, sport, NULL, &res) == 0)
+ snprintf (port, sizeof (port), "%d", sport);
+ if (getaddrinfo (shost, port, &hints, &res) == 0)
{
memcpy (&src, res->ai_addr, srclen = res->ai_addrlen);
- vlc_freeaddrinfo (res);
+ freeaddrinfo (res);
}
char *head = vlc_sdp_Start (VLC_OBJECT (p_stream), SOUT_CFG_PREFIX,
p_sys->p_session =
sout_AnnounceRegisterSDP (p_sout, psz_sdp, dhost, p_method);
sout_MethodRelease (p_method);
+ free( psz_sdp );
}
free (dhost);
}