[SCM] libav/experimental: Do not use the server SSRC as client SSRC in the RTP demuxer

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 952139a3226b4668bfa1e523599a5fe89592de0c
Author: Luca Abeni <lucabe72 at email.it>
Date:   Mon Aug 23 11:53:27 2010 +0000

    Do not use the server SSRC as client SSRC in the RTP demuxer
    
    Originally committed as revision 24879 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c
index f350251..63dda0c 100644
--- a/libavformat/rtpdec.c
+++ b/libavformat/rtpdec.c
@@ -211,8 +211,9 @@ int rtp_check_and_send_back_rr(RTPDemuxContext *s, int count)
     put_byte(pb, (RTP_VERSION << 6) + 1); /* 1 report block */
     put_byte(pb, 201);
     put_be16(pb, 7); /* length in words - 1 */
-    put_be32(pb, s->ssrc); // our own SSRC
-    put_be32(pb, s->ssrc); // XXX: should be the server's here!
+    // our own SSRC: we use the server's SSRC + 1 to avoid conflicts
+    put_be32(pb, s->ssrc + 1);
+    put_be32(pb, s->ssrc); // server SSRC
     // some placeholders we should really fill...
     // RFC 1889/p64
     extended_max= stats->cycles + stats->max_seq;

-- 
Libav/FFmpeg packaging