diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-12-17 16:57:34 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-12-17 16:57:34 +0000 |
| commit | b41af27637477297a1b575904a596d1dfa8a7531 (patch) | |
| tree | ef9aadf749392be2c22ed1316ebbe307eaa620a2 /src/demuxers | |
| parent | b6df7d39efa2fffefe0685d271e28038c484512a (diff) | |
| parent | a7e8065a32e0151ef995d696881d4d2ecf27fd33 (diff) | |
| download | xine-lib-b41af27637477297a1b575904a596d1dfa8a7531.tar.gz xine-lib-b41af27637477297a1b575904a596d1dfa8a7531.tar.bz2 | |
Merge from 1.1.
Diffstat (limited to 'src/demuxers')
| -rw-r--r-- | src/demuxers/demux_real.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/demuxers/demux_real.c b/src/demuxers/demux_real.c index 761296ac4..af74d979b 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'; @@ -1529,7 +1529,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,"<smil>") ) + if( strstr(buf,"pnm://") || strstr(buf,"rtsp://") || strstr(buf,"<smil>") || + strstr(buf,"http://") ) return 2; return 0; |