fixed cseq calculation

ignore unknown media stream descriptions

CVS patchset: 3572
CVS date: 2002/12/17 10:33:35

2 files changed, 13 insertions, 6 deletions

diff --git a/src/input/libreal/real.c b/src/input/libreal/real.c
index a239712b8..d4e2c9473 100644
--- a/src/input/libreal/real.c
+++ b/src/input/libreal/real.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: real.c,v 1.3 2002/12/16 21:50:54 holstsn Exp $
+ * $Id: real.c,v 1.4 2002/12/17 10:33:35 holstsn Exp $
  *
  * special functions for real streams.
  * adopted from joschkas real tools.
@@ -600,12 +600,18 @@ rmff_header_t *real_parse_sdp(const char *data, char *stream_rules, uint32_t ban
       media=h->streams[0];
       have_audio=1;
       stream=0;
-    }
-    if(sdp_filter(data,"m=video",buf))
+    } else if(sdp_filter(data,"m=video",buf))
     {
       media=h->streams[1];
       have_video=1;
       stream=1;
+    } else if(sdp_filter(data,"m=",buf))
+    {
+      printf("real: warning: unknown media stream type '%s'\n", buf);
+      do {
+        data+=strchr(data,'\n')-data+1;
+      } while (*data && data[0]!='m');
+      continue;
     }
   
     /* cont stuff */
diff --git a/src/input/librtsp/rtsp.c b/src/input/librtsp/rtsp.c
index 15cef3066..c8706a187 100644
--- a/src/input/librtsp/rtsp.c
+++ b/src/input/librtsp/rtsp.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: rtsp.c,v 1.3 2002/12/16 21:50:55 holstsn Exp $
+ * $Id: rtsp.c,v 1.4 2002/12/17 10:33:35 holstsn Exp $
  *
  * a minimalistic implementation of rtsp protocol,
  * *not* RFC 2326 compilant yet.
@@ -377,8 +377,7 @@ static int rtsp_get_answers(rtsp_t *s) {
         printf("librtsp: warning: Cseq mismatch. got %u, assumed %u", answer_seq, s->cseq);
 #endif
         s->cseq=answer_seq;
-      } else
-        s->cseq++;
+      }
     }
     if (!strncmp(answer,"Server:",7)) {
       sscanf(answer,"Server: %s",s->buffer);
@@ -406,6 +405,8 @@ static int rtsp_get_answers(rtsp_t *s) {
     answer_ptr++;
   } while (strlen(answer)!=0);
   
+  s->cseq++;
+  
   *answer_ptr=NULL;
   rtsp_schedule_standard(s);