Merge commit 'e22ffb3805f6994bd1fd7ab73e6297f36a53f915'

[ffmpeg] / libavformat / rtsp.c

diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index 82c6c12af572cb9e708bc249343d5a57e88ec9c6..975637cf54c0c75fbb315889cbf6eff07c6bed63 100644 (file)
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -454,7 +454,10 @@ static void sdp_parse_line(AVFormatContext *s, SDPParseState *s1,
         } else if (!strcmp(st_type, "text")) {
             codec_type = AVMEDIA_TYPE_SUBTITLE;
         }
-        if (codec_type == AVMEDIA_TYPE_UNKNOWN || !(rt->media_type_mask & (1 << codec_type))) {
+        if (codec_type == AVMEDIA_TYPE_UNKNOWN ||
+            !(rt->media_type_mask & (1 << codec_type)) ||
+            rt->nb_rtsp_streams >= s->max_streams
+        ) {
             s1->skip_media = 1;
             return;
         }