Merge from 1.2 tip.

--HG--
rename : src/combined/ffmpeg/ff_dvaudio_decoder.c => src/audio_dec/ff_dvaudio_decoder.c

1 files changed, 22 insertions, 6 deletions

diff --git a/src/demuxers/demux_real.c b/src/demuxers/demux_real.c
index 21308bd45..41c6fb4a2 100644
--- a/src/demuxers/demux_real.c
+++ b/src/demuxers/demux_real.c
@@ -459,6 +459,9 @@ static void real_parse_headers (demux_real_t *this) {
 
           this->num_audio_streams++;
 
+          if (!this->audio_streams[this->num_audio_streams].buf_type)
+            _x_report_audio_format_tag (this->stream->xine, LOG_MODULE, fourcc);
+
         } else if(_X_BE_32(mdpr->type_specific_data + 4) == VIDO_TAG) {
 
           if(this->num_video_streams == MAX_VIDEO_STREAMS) {
@@ -479,6 +482,9 @@ static void real_parse_headers (demux_real_t *this) {
 
           this->num_video_streams++;
 
+          if (!this->video_streams[this->num_video_streams].buf_type)
+            _x_report_video_fourcc (this->stream->xine, LOG_MODULE, fourcc);
+
         } else {
           lprintf("unrecognised type specific data\n");
 
@@ -800,12 +806,22 @@ static int demux_real_parse_references( demux_real_t *this) {
 
   if (!strncmp(buf,"http://",7))
   {
-    for (i = 0; buf[i] && !isspace(buf[i]); ++i)
-      /**/;
-    buf[i] = 0;
-    lprintf("reference [%s] found\n", buf);
-
-    _x_demux_send_mrl_reference (this->stream, 0, buf, NULL, 0, 0);
+    i = 0;
+    while (buf[i])
+    {
+      j = i;
+      while (buf[i] && !isspace(buf[i]))
+	++i; /* skip non-space */
+      len = buf[i];
+      buf[i] = 0;
+      if (strncmp (buf + j, "http://", 7) || (i - j) < 8)
+        break; /* stop at the first non-http reference */
+      lprintf("reference [%s] found\n", buf + j);
+      _x_demux_send_mrl_reference (this->stream, 0, buf + j, NULL, 0, 0);
+      buf[i] = (char) len;
+      while (buf[i] && isspace(buf[i]))
+	++i; /* skip spaces */
+    }
   }
   else for (i = 0; i < buf_used; ++i)
   {