[SCM] libav/experimental: rtsp: Check if the rtp stream actually has an RTPDemuxContext

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 9e99f84f7d4fabbbf224da152eacd8f4a50b7bd3
Author: Martin Storsjö <martin at martin.st>
Date:   Mon Dec 27 09:56:19 2010 +0000

    rtsp: Check if the rtp stream actually has an RTPDemuxContext
    
    For example MS-RTSP doesn't have RTPDemuxContexts for all streams.
    
    This fixes issue 2448.
    
    Originally committed as revision 26107 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index 48ed6b5..8c9d79c 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -1557,7 +1557,10 @@ int ff_rtsp_fetch_packet(AVFormatContext *s, AVPacket *pkt)
         int64_t first_queue_time = 0;
         for (i = 0; i < rt->nb_rtsp_streams; i++) {
             RTPDemuxContext *rtpctx = rt->rtsp_streams[i]->transport_priv;
-            int64_t queue_time = ff_rtp_queued_packet_time(rtpctx);
+            int64_t queue_time;
+            if (!rtpctx)
+                continue;
+            queue_time = ff_rtp_queued_packet_time(rtpctx);
             if (queue_time && (queue_time - first_queue_time < 0 ||
                                !first_queue_time)) {
                 first_queue_time = queue_time;

-- 
Libav/FFmpeg packaging