diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-03 01:18:24 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-03 01:18:24 +0200 |
| commit | fb09531720a4aa2dfa97e5a9a246a453b6278fd2 (patch) | |
| tree | 61525c3a8ddb419d3838a26e488fc3659079bbcd /contrib/ffmpeg/libavformat/rtpproto.c | |
| parent | 294d01046724e28b7193bcb65bf2a0391b0135b6 (diff) | |
| download | xine-lib-fb09531720a4aa2dfa97e5a9a246a453b6278fd2.tar.gz xine-lib-fb09531720a4aa2dfa97e5a9a246a453b6278fd2.tar.bz2 | |
Sync with a more recent version of FFmpeg.
Diffstat (limited to 'contrib/ffmpeg/libavformat/rtpproto.c')
| -rw-r--r-- | contrib/ffmpeg/libavformat/rtpproto.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/contrib/ffmpeg/libavformat/rtpproto.c b/contrib/ffmpeg/libavformat/rtpproto.c index d31c509c2..4d32e667d 100644 --- a/contrib/ffmpeg/libavformat/rtpproto.c +++ b/contrib/ffmpeg/libavformat/rtpproto.c @@ -22,15 +22,7 @@ #include <unistd.h> #include <stdarg.h> -#include <sys/types.h> -#include <sys/socket.h> -#include <netinet/in.h> -#ifndef __BEOS__ -# include <arpa/inet.h> -#else -# include "barpainet.h" -#endif -#include <netdb.h> +#include "network.h" #include <fcntl.h> #define RTP_TX_BUF_SIZE (64 * 1024) @@ -96,7 +88,7 @@ static void build_udp_url(char *buf, int buf_size, if (local_port >= 0) url_add_option(buf, buf_size, "localport=%d", local_port); if (multicast) - url_add_option(buf, buf_size, "multicast=1", multicast); + url_add_option(buf, buf_size, "multicast=1"); if (ttl >= 0) url_add_option(buf, buf_size, "ttl=%d", ttl); } @@ -121,7 +113,7 @@ static int rtp_open(URLContext *h, const char *uri, int flags) s = av_mallocz(sizeof(RTPContext)); if (!s) - return -ENOMEM; + return AVERROR(ENOMEM); h->priv_data = s; url_split(NULL, 0, NULL, 0, hostname, sizeof(hostname), &port, |