* modules/access/udp.c: use the "ts" demux when in rtp mode (and not "ts2").

* modules/mux/mp4.c: Warning fix patch by Zoltan Nagy.

diff --git a/modules/access/udp.c b/modules/access/udp.c
index c59f33d9ed9a057297e791c8e56c1fdd3ec5a4b1..2271b35e0f5537956265938e8d1710554bb46d4f 100644 (file)
--- a/modules/access/udp.c
+++ b/modules/access/udp.c
@@ -423,7 +423,7 @@ static block_t *BlockChoose( access_t *p_access )
     {
         case 33:
             msg_Dbg( p_access, "detected TS over RTP" );
-            p_access->psz_demux = strdup( "ts2" );
+            p_access->psz_demux = strdup( "ts" );
             break;
 
         case 14:

diff --git a/modules/mux/mp4.c b/modules/mux/mp4.c
index 2d646fd5c38693c1767ec6caf77b0960cdc0a84b..cd02754d6f9e4b05c1f38c63300362e1225033b4 100644 (file)
--- a/modules/mux/mp4.c
+++ b/modules/mux/mp4.c
@@ -742,7 +742,7 @@ static bo_t *GetESDS( mp4_stream_t *p_stream )
     int  i_stream_type;
     int  i_object_type_indication;
     int  i_decoder_specific_info_size;
-    int i;
+    unsigned int i;
     int64_t i_bitrate_avg = 0;
     int64_t i_bitrate_max = 0;