[vlc-devel] commit: RTP: fix the conflicting audio and video port error handling ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Wed Jan  7 20:48:58 2009 +0200| [eb3d87723c1ab9d5f695550e4b071e92b2ef2118] | committer: Rémi Denis-Courmont 

RTP: fix the conflicting audio and video port error handling

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=eb3d87723c1ab9d5f695550e4b071e92b2ef2118
---

 modules/stream_out/rtp.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c
index da26a6c..8ec54d9 100644
--- a/modules/stream_out/rtp.c
+++ b/modules/stream_out/rtp.c
@@ -354,11 +354,10 @@ static int Open( vlc_object_t *p_this )
 
     p_sys->psz_sdp_file = NULL;
 
-    if( p_sys->i_port_audio == p_sys->i_port_video )
+    if( p_sys->i_port_audio && p_sys->i_port_video == p_sys->i_port_audio )
     {
-        msg_Err( p_stream, "audio and video port cannot be the same" );
-        p_sys->i_port_audio = 0;
-        p_sys->i_port_video = 0;
+        msg_Err( p_stream, "audio and video RTP port must be distinct" );
+        return VLC_EGENERIC;
     }
 
     for( p_cfg = p_stream->p_cfg; p_cfg != NULL; p_cfg = p_cfg->p_next )