* demux/sdp: a msg_Err -> msg_Warn. Btw, it begins to work well (under linux).

 (MPEG-I/II/4 audio and video, h261 video, some ac3 streams sould work).
 * demux/* : removed useless include

diff --git a/modules/demux/Modules.am b/modules/demux/Modules.am
index e786671069efbbbb9f245d31f6bf93cd2a0f3e4e..5ba3d5960aaf801da48690cba6d0d681cebd76d6 100644 (file)
--- a/modules/demux/Modules.am
+++ b/modules/demux/Modules.am
@@ -8,3 +8,4 @@ SOURCES_au = au.c
 SOURCES_wav = wav.c
 SOURCES_aac = aac.c
 SOURCES_mkv = mkv.cpp
+SOURCES_sdp = sdp.c

diff --git a/modules/demux/mpeg/es.c b/modules/demux/mpeg/es.c
index b7dd1eecc1d6c8dd891f51a81bde1f779c1a9884..960ccdc05ef6842f0780a1030b3094b950ec983e 100644 (file)
--- a/modules/demux/mpeg/es.c
+++ b/modules/demux/mpeg/es.c
@@ -2,7 +2,7 @@
  * mpeg_es.c : Elementary Stream input module for vlc
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: es.c,v 1.4 2003/09/07 22:48:29 fenrir Exp $
+ * $Id: es.c,v 1.5 2003/09/10 11:51:00 fenrir Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -25,7 +25,6 @@
  * Preamble
  *****************************************************************************/
 #include <stdlib.h>                                      /* malloc(), free() */
-#include <string.h>                                              /* strdup() */
 
 #include <vlc/vlc.h>
 #include <vlc/input.h>

diff --git a/modules/demux/mpeg/m4v.c b/modules/demux/mpeg/m4v.c
index d52394ab19141e5f6d0a49c052c656075a006c0d..0646c3fbf35ffa565b60a0bdd31d969a1707f0a6 100644 (file)
--- a/modules/demux/mpeg/m4v.c
+++ b/modules/demux/mpeg/m4v.c
@@ -2,7 +2,7 @@
  * m4v.c : MPEG-4 video Stream input module for vlc
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: m4v.c,v 1.7 2003/09/07 22:48:29 fenrir Exp $
+ * $Id: m4v.c,v 1.8 2003/09/10 11:51:00 fenrir Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -25,7 +25,6 @@
  * Preamble
  *****************************************************************************/
 #include <stdlib.h>                                      /* malloc(), free() */
-#include <string.h>
 
 #include <vlc/vlc.h>
 #include <vlc/input.h>

diff --git a/modules/demux/mpeg/ps.c b/modules/demux/mpeg/ps.c
index 7510f8106569e2d6c4434f4b9a9486077203b61c..b33f8c04171d666f5eee97b3ec92daa245652a3e 100644 (file)
--- a/modules/demux/mpeg/ps.c
+++ b/modules/demux/mpeg/ps.c
@@ -2,7 +2,7 @@
  * ps.c : Program Stream input module for vlc
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: ps.c,v 1.10 2003/09/07 22:48:29 fenrir Exp $
+ * $Id: ps.c,v 1.11 2003/09/10 11:51:00 fenrir Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -25,7 +25,6 @@
  * Preamble
  *****************************************************************************/
 #include <stdlib.h>                                      /* malloc(), free() */
-#include <string.h>                                              /* strdup() */
 
 #include <vlc/vlc.h>
 #include <vlc/input.h>

diff --git a/modules/demux/mpeg/system.c b/modules/demux/mpeg/system.c
index 3ba73c36b27124c312365c726c7a50baa14d8311..3cd3154300b9eeaf1604013f3d0a3aa9f976c3b9 100644 (file)
--- a/modules/demux/mpeg/system.c
+++ b/modules/demux/mpeg/system.c
@@ -2,7 +2,7 @@
  * system.c: helper module for TS, PS and PES management
  *****************************************************************************
  * Copyright (C) 1998-2002 VideoLAN
- * $Id: system.c,v 1.16 2003/07/13 12:35:13 massiot Exp $
+ * $Id: system.c,v 1.17 2003/09/10 11:51:00 fenrir Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Michel Lespinasse <walken@via.ecp.fr>
@@ -29,7 +29,6 @@
  * Preamble
  *****************************************************************************/
 #include <stdlib.h>
-#include <string.h>                                    /* memcpy(), memset() */
 
 #include <vlc/vlc.h>
 #include <vlc/input.h>

diff --git a/modules/demux/mpeg/ts.c b/modules/demux/mpeg/ts.c
index a7052cb5d668ac86ffbe027bf8198a4a19d08e24..bf8e0f1d14240c15cd8b7fa5ba421e91362f0929 100644 (file)
--- a/modules/demux/mpeg/ts.c
+++ b/modules/demux/mpeg/ts.c
@@ -2,7 +2,7 @@
  * mpeg_ts.c : Transport Stream input module for vlc
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: ts.c,v 1.35 2003/09/07 22:48:29 fenrir Exp $
+ * $Id: ts.c,v 1.36 2003/09/10 11:51:00 fenrir Exp $
  *
  * Authors: Henri Fallon <henri@via.ecp.fr>
  *          Johan Bilien <jobi@via.ecp.fr>
@@ -26,12 +26,6 @@
  * Preamble
  *****************************************************************************/
 #include <stdlib.h>
-#include <string.h>
-
-#ifdef HAVE_STDINT_H
-#   include <stdint.h>                                            /* uint8_t */
-#endif
-
 #include <vlc/vlc.h>
 #include <vlc/input.h>
 

diff --git a/modules/demux/sdp.c b/modules/demux/sdp.c
index 0ca235eefd04473893cbb3106f57653347dfd93d..4414605e826d24cac5c7ccbb6263e57dfee2f785 100644 (file)
--- a/modules/demux/sdp.c
+++ b/modules/demux/sdp.c
@@ -2,7 +2,7 @@
  * sdp.c: SDP parser and builtin UDP/RTP/RTSP
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: sdp.c,v 1.9 2003/09/08 13:37:52 fenrir Exp $
+ * $Id: sdp.c,v 1.10 2003/09/10 11:51:00 fenrir Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -244,7 +244,7 @@ static int SDPOpen( vlc_object_t * p_this )
     if( strncmp( p_peek, "v=0\r\n", 5 ) &&
         strncmp( p_peek, "v=0\n", 4 ) )
     {
-        msg_Err( p_input, "SDP module discarded" );
+        msg_Warn( p_input, "SDP module discarded" );
         return VLC_EGENERIC;
     }