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. --- ChangeLog | 1 + src/demuxers/demux_real.c | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2102e3db5..54299baf0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,6 +27,7 @@ xine-lib (1.1.9) (unreleased) (This was broken by ffmpeg revision 9283). * Enabled the WMV VC1 (ffmpeg) codec. * Fixed a crash that happened when a video output was closed + * Made the Real demuxer recognise http references. xine-lib (1.1.8) * Send a channel-changed event to the frontend when receiving the SYNC 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