From fdf9cb58ce03df58c25dc9dd0c9f939abd343183 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sun, 16 Dec 2007 14:23:25 +0000 Subject: Tell the Real demuxer about http references. --- src/demuxers/demux_real.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/demuxers/demux_real.c b/src/demuxers/demux_real.c index 11c5069eb..938e1ca24 100644 --- a/src/demuxers/demux_real.c +++ b/src/demuxers/demux_real.c @@ -820,8 +820,8 @@ static int demux_real_parse_references( demux_real_t *this) { if( !strncmp(&buf[i],"-->",3) ) comment = 0; - if( (!strncmp(&buf[i],"pnm://",6) || !strncmp(&buf[i],"rtsp://",7)) && - !comment ) { + if( (!strncmp(&buf[i],"pnm://",6) || !strncmp(&buf[i],"rtsp://",7) || + !strncmp(&buf[i],"http://",7)) && !comment ) { for(j=i; buf[j] && buf[j] != '"' && !isspace(buf[j]); j++ ) ; buf[j]='\0'; @@ -1532,7 +1532,8 @@ static int real_check_stream_type(uint8_t *buf, int len) return 1; buf[len] = '\0'; - if( strstr(buf,"pnm://") || strstr(buf,"rtsp://") || strstr(buf,"") ) + if( strstr(buf,"pnm://") || strstr(buf,"rtsp://") || strstr(buf,"") || + strstr(buf,"http://") ) return 2; return 0; -- cgit v1.2.3 From a7e8065a32e0151ef995d696881d4d2ecf27fd33 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Mon, 17 Dec 2007 16:55:35 +0000 Subject: Fix an off-by-one error concerning UTF-8-encoded BOMs. --- src/xine-utils/xmllexer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/xine-utils/xmllexer.c b/src/xine-utils/xmllexer.c index 75362e10d..047dbb1a6 100644 --- a/src/xine-utils/xmllexer.c +++ b/src/xine-utils/xmllexer.c @@ -106,7 +106,7 @@ void lexer_init(const char * buf, int size) { lex_convert (buf + 4, size - 4, UTF32BE); else if (size >= 4 && !memcmp (buf, boms, 4)) lex_convert (buf + 4, size - 4, UTF32LE); - else if (size >= 3 && !memcmp (buf, bom_utf8, 4)) + else if (size >= 3 && !memcmp (buf, bom_utf8, 3)) { lexbuf += 3; lexbuf_size -= 3; -- cgit v1.2.3