Export URI from RTP module . Closes:#403

[vlc] / modules / stream_out / mosaic_bridge.c

diff --git a/modules/stream_out/mosaic_bridge.c b/modules/stream_out/mosaic_bridge.c
index b9ac4c474a5fc256bdb1f3252ed1a4f0803d73b3..1ba5cbd848cab77b0e01ba12f20dae797c8c7dfc 100644 (file)
--- a/modules/stream_out/mosaic_bridge.c
+++ b/modules/stream_out/mosaic_bridge.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * mosaic_bridge.c:
  *****************************************************************************
- * Copyright (C) 2004-2005 VideoLAN
+ * Copyright (C) 2004-2005 the VideoLAN team
  * $Id$
  *
  * Authors: Antoine Cellerier <dionoea@videolan.org>
@@ -161,10 +161,10 @@ static int Open( vlc_object_t *p_this )
     p_sys->psz_id = val.psz_string;
 
     var_Get( p_stream, SOUT_CFG_PREFIX "height", &val );
-    p_sys->i_height = val.i_int; 
+    p_sys->i_height = val.i_int;
 
     var_Get( p_stream, SOUT_CFG_PREFIX "width", &val );
-    p_sys->i_width = val.i_int; 
+    p_sys->i_width = val.i_int;
 
     var_Get( p_stream, SOUT_CFG_PREFIX "sar", &val );
     if ( val.psz_string )
@@ -176,8 +176,8 @@ static int Open( vlc_object_t *p_this )
             *psz_parser++ = '\0';
             p_sys->i_sar_num = atoi( val.psz_string );
             p_sys->i_sar_den = atoi( psz_parser );
-            vlc_reduce( &p_sys->i_sar_num, &p_sys->i_sar_den,
-                        p_sys->i_sar_num, p_sys->i_sar_den, 0 );
+            vlc_ureduce( &p_sys->i_sar_num, &p_sys->i_sar_den,
+                         p_sys->i_sar_num, p_sys->i_sar_den, 0 );
         }
         else
         {
@@ -192,11 +192,6 @@ static int Open( vlc_object_t *p_this )
         p_sys->i_sar_num = p_sys->i_sar_den = 1;
     }
 
-    if ( p_sys->i_height || p_sys->i_width )
-    {
-        p_sys->p_image = image_HandlerCreate( p_stream );
-    }
-
     p_stream->pf_add    = Add;
     p_stream->pf_del    = Del;
     p_stream->pf_send   = Send;
@@ -308,6 +303,11 @@ static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
 
     vlc_mutex_unlock( p_sys->p_lock );
 
+    if ( p_sys->i_height || p_sys->i_width )
+    {
+        p_sys->p_image = image_HandlerCreate( p_stream );
+    }
+
     msg_Dbg( p_stream, "mosaic bridge id=%s pos=%d", p_es->psz_id, i );
 
     return (sout_stream_id_t *)p_sys;