Removed all vlc_object_find in lua osd code.

[vlc] / modules / misc / rtsp.c

diff --git a/modules/misc/rtsp.c b/modules/misc/rtsp.c
index fcacfe7f5c4312ddbef5c587ee23ae4846ff582e..b02756c6c59c26d4846473ba23af67b03631f092 100644 (file)
--- a/modules/misc/rtsp.c
+++ b/modules/misc/rtsp.c
@@ -492,6 +492,13 @@ static void MediaDel( vod_t *p_vod, vod_media_t *p_media )
 static int MediaAddES( vod_t *p_vod, vod_media_t *p_media, es_format_t *p_fmt )
 {
     char *psz_urlc;
+
+    if( p_media->i_payload_type >= 128 )
+    {
+        msg_Err( p_vod, "too many elementary streams");
+        return VLC_EGENERIC;
+    }
+
     media_es_t *p_es = calloc( 1, sizeof(media_es_t) );
     if( !p_es )
         return VLC_ENOMEM;
@@ -1106,7 +1113,7 @@ static int RtspCallback( httpd_callback_sys_t *p_args, httpd_client_t *cl,
                 {
                     double f_pos = ParseNPT (psz_position + 4);
                     msg_Dbg( p_vod, "seeking request: %s", psz_position );
-                    f_pos /= ((double)(p_media->i_length))/1000 /1000 / 100;
+                    f_pos /= ((double)(p_media->i_length)) / CLOCK_FREQ / 100;
                     CommandPush( p_vod, RTSP_CMD_TYPE_SEEK, p_media,
                                  psz_session, f_pos, NULL );
                 }
@@ -1398,20 +1405,20 @@ static int RtspCallbackES( httpd_callback_sys_t *p_args, httpd_client_t *cl,
                     if( strstr( psz_transport, "MP2T/H2221/UDP" ) )
                     {
                         httpd_MsgAdd( answer, "Transport",
-                                     "MP2T/H2221/UDP;client_port=%d-%d",
+                                     "MP2T/H2221/UDP;unicast;client_port=%d-%d",
                                      p_rtsp_es->i_port, p_rtsp_es->i_port + 1 );
                     }
                     else if( strstr( psz_transport, "RAW/RAW/UDP" ) )
                     {
                         httpd_MsgAdd( answer, "Transport",
-                                     "RAW/RAW/UDP;client_port=%d-%d",
+                                     "RAW/RAW/UDP;unicast;client_port=%d-%d",
                                      p_rtsp_es->i_port, p_rtsp_es->i_port + 1 );
                     }
                 }
                 else
                 {
                     httpd_MsgAdd( answer, "Transport",
-                                  "RTP/AVP/UDP;client_port=%d-%d",
+                                  "RTP/AVP/UDP;unicast;client_port=%d-%d",
                                   p_rtsp_es->i_port, p_rtsp_es->i_port + 1 );
                 }
             }
@@ -1440,7 +1447,7 @@ static int RtspCallbackES( httpd_callback_sys_t *p_args, httpd_client_t *cl,
             {
                 double f_pos = ParseNPT (psz_position + 4);
                 msg_Dbg( p_vod, "seeking request: %s", psz_position );
-                f_pos /= ((double)(p_media->i_length))/1000 /1000 / 100;
+                f_pos /= ((double)(p_media->i_length)) / CLOCK_FREQ / 100;
                 CommandPush( p_vod, RTSP_CMD_TYPE_SEEK, p_media,
                              psz_session, f_pos, NULL );
             }