diff options
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/asf_mmst_streaming.c | 4 | ||||
| -rw-r--r-- | libmpdemux/demux_ts.c | 1 | ||||
| -rw-r--r-- | libmpdemux/url.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/libmpdemux/asf_mmst_streaming.c b/libmpdemux/asf_mmst_streaming.c index 4e170b1dce..c5a75fa497 100644 --- a/libmpdemux/asf_mmst_streaming.c +++ b/libmpdemux/asf_mmst_streaming.c @@ -118,7 +118,7 @@ static void string_utf16(char *dest, char *src, int len) { size_t len1, len2; char *ip, *op; - if (url_conv != -1) + if (url_conv != (iconv_t)(-1)) { memset(dest, 0, 1000); len1 = len; len2 = 1000; @@ -588,7 +588,7 @@ int asf_mmst_streaming_start(stream_t *stream) printf("mmst packet_length = %d\n",packet_length); #ifdef USE_ICONV - if (url_conv != -1) + if (url_conv != (iconv_t)(-1)) iconv_close(url_conv); #endif diff --git a/libmpdemux/demux_ts.c b/libmpdemux/demux_ts.c index 954326f1ce..532d5bcdb3 100644 --- a/libmpdemux/demux_ts.c +++ b/libmpdemux/demux_ts.c @@ -31,6 +31,7 @@ #include "stream.h" #include "demuxer.h" +#include "parse_es.h" #include "stheader.h" #include "bswap.h" diff --git a/libmpdemux/url.c b/libmpdemux/url.c index d14f9ce056..c24f4dee45 100644 --- a/libmpdemux/url.c +++ b/libmpdemux/url.c @@ -43,7 +43,7 @@ url_new(const char* url) { if( ptr1==NULL ) { // Check for a special case: "sip:" (without "//"): if (strstr(url, "sip:") == url) { - ptr1 = &url[3]; // points to ':' + ptr1 = (char *)&url[3]; // points to ':' jumpSize = 1; } else { mp_msg(MSGT_NETWORK,MSGL_V,"Not an URL!\n"); |